tmpnam(open->name_err);
tmpnam(open->name_out);
#else
- tmpnam_s(open->name_err, L_tmpnam);
- tmpnam_s(open->name_out, L_tmpnam);
+ tmpnam_s(open->name_err, L_tmpnam);
+ tmpnam_s(open->name_out, L_tmpnam);
#endif
(void)mode; /* excluded */
return open->handles;
}
- static void task_pclose(FILE **files) {
+ static int task_pclose(FILE **files) {
popen_t *open = ((popen_t*)files);
fs_file_close(files[1]);
fs_file_close(files[2]);
remove(open->name_out);
mem_d(open);
+
+ return EXIT_SUCCESS;
}
-# define popen _popen
-# define pclose _pclose
+# define popen _popen
+# define pclose _pclose
#endif /*! _WIN32 */
#define TASK_COMPILE 0
char **directories = NULL;
char *claim = util_strdup(curdir);
size_t i;
-
+
vec_push(directories, claim);
dir = fs_dir_open(claim);
*/
for (i = 0; i < vec_size(directories); i++) {
dir = fs_dir_open(directories[i]);
-
+
while ((files = fs_dir_read(dir))) {
util_snprintf(buffer, sizeof(buffer), "%s/%s", directories[i], files->d_name);
if (stat(buffer, &directory) == -1) {
vec_push(task_tasks, task);
}
}
-
+
fs_dir_close(dir);
mem_d(directories[i]); /* free claimed memory */
}
static bool task_trymatch(size_t i, char ***line) {
bool success = true;
bool process = true;
+ int retval = EXIT_SUCCESS;
FILE *execute;
char buffer[4096];
task_template_t *tmpl = task_tasks[i].tmpl;
-
+
memset (buffer,0,sizeof(buffer));
if (!strcmp(tmpl->proceduretype, "-execute")) {
*/
if (!(execute = fs_file_open(task_tasks[i].stderrlogfile, "r")))
return false;
-
+
process = false;
}
char *data = NULL;
size_t size = 0;
size_t compare = 0;
-
+
while (fs_file_getline(&data, &size, execute) != EOF) {
if (!strcmp(data, "No main function found\n")) {
con_err("test failure: `%s` (No main function found) [%s]\n",
*/
if (strrchr(data, '\n'))
*strrchr(data, '\n') = '\0';
-
+
/*
* We remove the file/directory and stuff from the error
* match messages when testing diagnostics.
data = NULL;
size = 0;
}
+
+ if (compare != vec_size(tmpl->comparematch))
+ success = false;
+
mem_d(data);
data = NULL;
}
if (process)
- pclose(execute);
+ retval = pclose(execute);
else
fs_file_close(execute);
- return success;
+ return success && retval == EXIT_SUCCESS;
}
static const char *task_type(task_template_t *tmpl) {
* Generate a task from thin air if it requires execution in
* the QCVM.
*/
-
+
/* diagnostic is not executed, but compare tested instead, like preproessor */
execute = !! (!strcmp(task_tasks[i].tmpl->proceduretype, "-execute")) ||
(!strcmp(task_tasks[i].tmpl->proceduretype, "-pp")) ||
failed++;
continue;
}
-
+
for (j = 0; j < vec_size(match); j++)
mem_d(match[j]);
vec_free(match);
succeed = test_perform("tests", defs);
stat_info();
-
return (succeed) ? EXIT_SUCCESS : EXIT_FAILURE;
}