X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=test.c;h=fdf3777f4f0af16363a5f6170ab2749742240f16;hb=c8a1b6563ef73f82e39202bc9802fee355a4699b;hp=6fdee5134de3d07d85738035f881d62b2234a1a8;hpb=b3c1b469250ecd365c07340f085c2238d30175f9;p=xonotic%2Fgmqcc.git diff --git a/test.c b/test.c index 6fdee51..fdf3777 100644 --- a/test.c +++ b/test.c @@ -621,17 +621,17 @@ failure: 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 @@ -639,18 +639,18 @@ static void task_template_destroy(task_template_t **tmpl) { */ { 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); } /* @@ -736,7 +736,6 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { char *qcflags = NULL; task_t task; - util_debug("TEST", "compiling task template: %s/%s\n", directories[i], files->d_name); found ++; if (!tmpl) { con_err("error compiling task template: %s\n", files->d_name); @@ -847,8 +846,6 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { continue; } - util_debug("TEST", "executing test: `%s` [%s]\n", tmpl->description, buf); - /* * Open up some file desciptors for logging the stdout/stderr * to our own. @@ -876,11 +873,6 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { } vec_free(directories); - util_debug("TEST", "compiled %d task template files out of %d\n", - vec_size(task_tasks), - found - ); - return success; } @@ -903,8 +895,6 @@ static void task_precleanup(const char *curdir) { util_snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); if (remove(buffer)) con_err("error removing temporary file: %s\n", buffer); - else - util_debug("TEST", "removed temporary file: %s\n", buffer); } } @@ -923,7 +913,6 @@ static void task_destroy(void) { * 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); @@ -935,12 +924,8 @@ static void task_destroy(void) { if (task_tasks[i].compiled || !strcmp(task_tasks[i].tmpl->proceduretype, "-fail")) { if (remove(task_tasks[i].stdoutlogfile)) con_err("error removing stdout log file: %s\n", task_tasks[i].stdoutlogfile); - else - util_debug("TEST", "removed stdout log file: %s\n", task_tasks[i].stdoutlogfile); if (remove(task_tasks[i].stderrlogfile)) con_err("error removing stderr log file: %s\n", task_tasks[i].stderrlogfile); - else - util_debug("TEST", "removed stderr log file: %s\n", task_tasks[i].stderrlogfile); (void)!remove(task_tasks[i].tmpl->tempfilename); } @@ -949,7 +934,7 @@ static void task_destroy(void) { 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); } @@ -988,11 +973,6 @@ static bool task_trymatch(size_t i, char ***line) { ); } - util_debug("TEST", "executing qcvm: `%s` [%s]\n", - tmpl->description, - buffer - ); - execute = popen(buffer, "r"); if (!execute) return false; @@ -1061,10 +1041,11 @@ static bool task_trymatch(size_t i, char ***line) { } /* - * 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) { @@ -1138,7 +1119,6 @@ static size_t task_schedualize(size_t *pad) { con_out("test #%u %*s", i + 1, strlen(space[0]) - strlen(space[1]), ""); - util_debug("TEST", "executing task: %d: %s\n", i, task_tasks[i].tmpl->description); /* * Generate a task from thin air if it requires execution in * the QCVM. @@ -1197,6 +1177,18 @@ static size_t task_schedualize(size_t *pad) { 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,