return NULL;
}
-static void task_template_destroy(task_template_t **tmpl) {
+static void task_template_destroy(task_template_t *tmpl) {
if (!tmpl)
return;
- if ((*tmpl)->description) mem_d((*tmpl)->description);
- if ((*tmpl)->proceduretype) mem_d((*tmpl)->proceduretype);
- if ((*tmpl)->compileflags) mem_d((*tmpl)->compileflags);
- if ((*tmpl)->executeflags) mem_d((*tmpl)->executeflags);
- if ((*tmpl)->sourcefile) mem_d((*tmpl)->sourcefile);
- if ((*tmpl)->rulesfile) mem_d((*tmpl)->rulesfile);
- if ((*tmpl)->testflags) mem_d((*tmpl)->testflags);
+ if (tmpl->description) mem_d(tmpl->description);
+ if (tmpl->proceduretype) mem_d(tmpl->proceduretype);
+ if (tmpl->compileflags) mem_d(tmpl->compileflags);
+ if (tmpl->executeflags) mem_d(tmpl->executeflags);
+ if (tmpl->sourcefile) mem_d(tmpl->sourcefile);
+ if (tmpl->rulesfile) mem_d(tmpl->rulesfile);
+ if (tmpl->testflags) mem_d(tmpl->testflags);
/*
* Delete all allocated string for task tmpl then destroy the
*/
{
size_t i = 0;
- for (; i < vec_size((*tmpl)->comparematch); i++)
- mem_d((*tmpl)->comparematch[i]);
+ for (; i < vec_size(tmpl->comparematch); i++)
+ mem_d(tmpl->comparematch[i]);
- vec_free((*tmpl)->comparematch);
+ vec_free(tmpl->comparematch);
}
/*
* Nullify all the template members otherwise NULL comparision
* checks will fail if tmpl pointer is reused.
*/
- mem_d((*tmpl)->tempfilename);
- mem_d(*tmpl);
+ mem_d(tmpl->tempfilename);
+ mem_d(tmpl);
}
/*
* Close any open handles to files or processes here. It's mighty
* annoying to have to do all this cleanup work.
*/
- if (task_tasks[i].runhandles) task_pclose(task_tasks[i].runhandles);
if (task_tasks[i].stdoutlog) fs_file_close (task_tasks[i].stdoutlog);
if (task_tasks[i].stderrlog) fs_file_close (task_tasks[i].stderrlog);
mem_d(task_tasks[i].stdoutlogfile);
mem_d(task_tasks[i].stderrlogfile);
- task_template_destroy(&task_tasks[i].tmpl);
+ task_template_destroy(task_tasks[i].tmpl);
}
vec_free(task_tasks);
}
}
/*
- * If data is just null now, that means the line was an empty
- * one and for that, we just ignore it.
+ * We need to ignore null lines for when -pp is used (preprocessor), since
+ * the preprocessor is likely to create empty newlines in certain macro
+ * instantations, otherwise it's in the wrong nature to ignore empty newlines.
*/
- if (!*data)
+ if (!strcmp(tmpl->proceduretype, "-pp") && !*data)
continue;
if (vec_size(tmpl->comparematch) > compare) {
continue;
}
+ if (task_pclose(task_tasks[i].runhandles) != EXIT_SUCCESS && strcmp(task_tasks[i].tmpl->proceduretype, "-fail")) {
+ con_out("failure: `%s` %*s %*s\n",
+ task_tasks[i].tmpl->description,
+ (pad[0] + pad[1] - strlen(task_tasks[i].tmpl->description)) + (strlen(task_tasks[i].tmpl->rulesfile) - pad[1]),
+ task_tasks[i].tmpl->rulesfile,
+ (pad[1] + pad[2] - strlen(task_tasks[i].tmpl->rulesfile)) + (strlen("(compiler didn't return exit success)") - pad[2]),
+ "(compiler didn't return exit success)"
+ );
+ failed++;
+ continue;
+ }
+
if (!execute) {
con_out("succeeded: `%s` %*s %*s\n",
task_tasks[i].tmpl->description,