Merge branch 'master' of github.com:sagiegurari/c_scriptexec

Author: sagiegurari

src/scriptexec.c

@@ -129,6 +129,10 @@ struct ScriptExecResult scriptexec_run_with_options(const char *script, struct S
   result.out = read_text_file(out_file, buffer);
   result.err = read_text_file(err_file, buffer);
 
+  // delete files
+  remove(script_file);
+  rmdir(dir_name);
+
   string_buffer_release(buffer);
 
   return(result);
@@ -159,6 +163,7 @@ char *read_text_file(char *file, struct StringBuffer *buffer)
   }
 
   fclose(fp);
+  remove(file);
 
   return(string_buffer_to_string(buffer));
 }

tests/test.c

@@ -48,3 +48,13 @@ void assert_string_equal(char *value1, char *value2)
     test_fail();
   }
 }
+
+
+void assert_string_starts_with(char *string, char *prefix)
+{
+  if (strncmp(prefix, string, strlen(prefix)) != 0)
+  {
+    printf("assert failed, value: %s does not start with: %s", string, prefix);
+    test_fail();
+  }
+}

tests/test.h

@@ -10,6 +10,7 @@ void assert_true(bool);
 
 void assert_num_equal(size_t, size_t);
 void assert_string_equal(char *, char *);
+void assert_string_starts_with(char * /* string */, char * /* prefix */);
 
 #endif
 

tests/test_exit_on_error_valid.c

@@ -12,7 +12,7 @@ void test_impl()
   struct ScriptExecResult result = scriptexec_run_with_options("echo 1\necho 2\necho 3\necho 4", options);
 
   assert_num_equal(result.code, 0);
-  assert_string_equal(result.out, "1\n2\n3\n4\n");
+  assert_string_starts_with(result.out, "1\n2\n3\n4");
   assert_string_equal(result.err, "");
 }
 

tests/test_valid_multiple_commands.c

@@ -7,7 +7,7 @@ void test_impl()
   struct ScriptExecResult result = scriptexec_run("echo 1\necho 2\necho 3\necho 4");
 
   assert_num_equal(result.code, 0);
-  assert_string_equal(result.out, "1\n2\n3\n4\n");
+  assert_string_starts_with(result.out, "1\n2\n3\n4");
   assert_string_equal(result.err, "");
 }
 

tests/test_valid_multiple_commands_default_options.c

@@ -9,7 +9,7 @@ void test_impl()
   struct ScriptExecResult  result = scriptexec_run_with_options("echo 1\necho 2\necho 3\necho 4", options);
 
   assert_num_equal(result.code, 0);
-  assert_string_equal(result.out, "1\n2\n3\n4\n");
+  assert_string_starts_with(result.out, "1\n2\n3\n4");
   assert_string_equal(result.err, "");
 }
 

tests/test_valid_multiple_commands_with_valid_runner.c

@@ -6,12 +6,12 @@ void test_impl()
 {
   struct ScriptExecOptions options = scriptexec_create_options();
 
-  options.runner = "bash";
+  options.runner = "sh";
 
   struct ScriptExecResult result = scriptexec_run_with_options("echo 1\necho 2\necho 3\necho 4", options);
 
   assert_num_equal(result.code, 0);
-  assert_string_equal(result.out, "1\n2\n3\n4\n");
+  assert_string_starts_with(result.out, "1\n2\n3\n4");
   assert_string_equal(result.err, "");
 }