X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=test.c;h=0af74771cda014922689192acba012216030c2fa;hp=107140e5cc7697f4a7e5e346e7334f12dd7a53cb;hb=10dd7aacfe87f97e10d61dff343e00b9c03eac69;hpb=462c06d56bfab0e0c430e3910d9fcba88cca19da diff --git a/test.c b/test.c index 107140e..0af7477 100644 --- a/test.c +++ b/test.c @@ -26,7 +26,7 @@ opts_cmd_t opts; -const char *task_bins[] = { +static const char *task_bins[] = { "./gmqcc", "./qcvm" }; @@ -152,27 +152,41 @@ int task_pclose(FILE **handles) { return status; } #else - /* - * Bidirectional piping implementation for windows using CreatePipe and DuplicateHandle + - * other hacks. - */ typedef struct { - int __dummy; - /* TODO: implement */ + FILE *handles[3]; + char name_err[L_tmpnam]; + char name_out[L_tmpnam]; } popen_t; FILE **task_popen(const char *command, const char *mode) { - (void)command; - (void)mode; + char *cmd = NULL; + popen_t *open = (popen_t*)mem_a(sizeof(popen_t)); + + tmpnam(open->name_err); + tmpnam(open->name_out); + + (void)mode; /* excluded */ + + util_asprintf(&cmd, "%s -redirout=%s -redirerr=%s", command, open->name_out, open->name_err); + + system(cmd); /* HACK */ + open->handles[0] = NULL; + open->handles[1] = fs_file_open(open->name_out, "r"); + open->handles[2] = fs_file_open(open->name_err, "r"); - /* TODO: implement */ - return NULL; + mem_d(cmd); + + return open->handles; } void task_pclose(FILE **files) { - /* TODO: implement */ - (void)files; - return; + popen_t *open = ((popen_t*)files); + fs_file_close(files[1]); + fs_file_close(files[2]); + remove(open->name_err); + remove(open->name_out); + + mem_d(open); } #endif /*! _WIN32 */ @@ -210,7 +224,7 @@ int task_pclose(FILE **handles) { * This will perform compilation and execution * -fail * This will perform compilation, but requires - * the compilation to fail in order to succeed. + * the compilation to fail in order to succeed. * * This must be provided, this tag is NOT optional. * @@ -329,7 +343,7 @@ bool task_template_generate(task_template_t *tmpl, char tag, const char *file, s /* * Create some padding for the description to align the * printing of the rules file. - */ + */ if ((desclen = strlen(tmpl->description)) > pad[0]) pad[0] = desclen; } @@ -488,7 +502,7 @@ task_template_t *task_template_compile(const char *file, const char *dir, size_t FILE *tempfile = NULL; task_template_t *tmpl = NULL; - snprintf(fullfile, sizeof(fullfile), "%s/%s", dir, file); + util_snprintf(fullfile, sizeof(fullfile), "%s/%s", dir, file); tempfile = fs_file_open(fullfile, "r"); tmpl = (task_template_t*)mem_a(sizeof(task_template_t)); @@ -497,7 +511,7 @@ task_template_t *task_template_compile(const char *file, const char *dir, size_t /* * Create some padding for the printing to align the * printing of the rules file to the console. - */ + */ if ((filepadd = strlen(fullfile)) > pad[1]) pad[1] = filepadd; @@ -640,7 +654,7 @@ typedef struct { bool compiled; } task_t; -task_t *task_tasks = NULL; +static task_t *task_tasks = NULL; /* * Read a directory and searches for all template files in it @@ -657,7 +671,7 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { dir = fs_dir_open(curdir); while ((files = fs_dir_read(dir))) { - snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); + util_snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); if (stat(buffer, &directory) == -1) { con_err("internal error: stat failed, aborting\n"); @@ -697,7 +711,16 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { * to test compile flags for all tests. This needs to be * BEFORE other flags (so that the .tmpl can override them) */ + #ifdef _MSC_VER + { + char buffer[4096]; + size_t size; + getenv_s(&size, buffer, sizeof(buffer), "QCFLAGS"); + qcflags = buffer; + } + #else qcflags = getenv("QCFLAGS"); + #endif /* * Generate the command required to open a pipe to a process @@ -707,7 +730,7 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { if (strcmp(tmpl->proceduretype, "-pp")) { if (qcflags) { if (tmpl->testflags && !strcmp(tmpl->testflags, "-no-defs")) { - snprintf(buf, sizeof(buf), "%s %s/%s %s %s -o %s", + util_snprintf(buf, sizeof(buf), "%s %s/%s %s %s -o %s", task_bins[TASK_COMPILE], curdir, tmpl->sourcefile, @@ -716,7 +739,7 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { tmpl->tempfilename ); } else { - snprintf(buf, sizeof(buf), "%s %s/%s %s/%s %s %s -o %s", + util_snprintf(buf, sizeof(buf), "%s %s/%s %s/%s %s %s -o %s", task_bins[TASK_COMPILE], curdir, defs, @@ -729,7 +752,7 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { } } else { if (tmpl->testflags && !strcmp(tmpl->testflags, "-no-defs")) { - snprintf(buf, sizeof(buf), "%s %s/%s %s -o %s", + util_snprintf(buf, sizeof(buf), "%s %s/%s %s -o %s", task_bins[TASK_COMPILE], curdir, tmpl->sourcefile, @@ -737,7 +760,7 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { tmpl->tempfilename ); } else { - snprintf(buf, sizeof(buf), "%s %s/%s %s/%s %s -o %s", + util_snprintf(buf, sizeof(buf), "%s %s/%s %s/%s %s -o %s", task_bins[TASK_COMPILE], curdir, defs, @@ -751,14 +774,14 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { } else { /* Preprocessing (qcflags mean shit all here we don't allow them) */ if (tmpl->testflags && !strcmp(tmpl->testflags, "-no-defs")) { - snprintf(buf, sizeof(buf), "%s -E %s/%s -o %s", + util_snprintf(buf, sizeof(buf), "%s -E %s/%s -o %s", task_bins[TASK_COMPILE], curdir, tmpl->sourcefile, tmpl->tempfilename ); } else { - snprintf(buf, sizeof(buf), "%s -E %s/%s %s/%s -o %s", + util_snprintf(buf, sizeof(buf), "%s -E %s/%s %s/%s -o %s", task_bins[TASK_COMPILE], curdir, defs, @@ -786,14 +809,14 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) { * Open up some file desciptors for logging the stdout/stderr * to our own. */ - snprintf(buf, sizeof(buf), "%s.stdout", tmpl->tempfilename); + util_snprintf(buf, sizeof(buf), "%s.stdout", tmpl->tempfilename); task.stdoutlogfile = util_strdup(buf); if (!(task.stdoutlog = fs_file_open(buf, "w"))) { con_err("error opening %s for stdout\n", buf); continue; } - snprintf(buf, sizeof(buf), "%s.stderr", tmpl->tempfilename); + util_snprintf(buf, sizeof(buf), "%s.stderr", tmpl->tempfilename); task.stderrlogfile = util_strdup(buf); if (!(task.stderrlog = fs_file_open(buf, "w"))) { con_err("error opening %s for stderr\n", buf); @@ -829,7 +852,7 @@ void task_precleanup(const char *curdir) { strstr(files->d_name, ".stdout") || strstr(files->d_name, ".stderr")) { - snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); + util_snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); if (remove(buffer)) con_err("error removing temporary file: %s\n", buffer); else @@ -859,7 +882,7 @@ void task_destroy(void) { /* * Only remove the log files if the test actually compiled otherwise * forget about it (or if it didn't compile, and the procedure type - * was set to -fail (meaning it shouldn't compile) .. stil remove) + * was set to -fail (meaning it shouldn't compile) .. stil remove) */ if (task_tasks[i].compiled || !strcmp(task_tasks[i].tmpl->proceduretype, "-fail")) { if (remove(task_tasks[i].stdoutlogfile)) @@ -887,10 +910,11 @@ void task_destroy(void) { * This executes the QCVM task for a specificly compiled progs.dat * using the template passed into it for call-flags and user defined * messages IF the procedure type is -execute, otherwise it matches - * the preprocessor output. + * the preprocessor output. */ bool task_trymatch(task_template_t *tmpl, char ***line) { bool success = true; + bool preprocessing = false; FILE *execute; char buffer[4096]; memset (buffer,0,sizeof(buffer)); @@ -901,12 +925,12 @@ bool task_trymatch(task_template_t *tmpl, char ***line) { * actually specified. */ if (!strcmp(tmpl->executeflags, "$null")) { - snprintf(buffer, sizeof(buffer), "%s %s", + util_snprintf(buffer, sizeof(buffer), "%s %s", task_bins[TASK_EXECUTE], tmpl->tempfilename ); } else { - snprintf(buffer, sizeof(buffer), "%s %s %s", + util_snprintf(buffer, sizeof(buffer), "%s %s %s", task_bins[TASK_EXECUTE], tmpl->executeflags, tmpl->tempfilename @@ -928,6 +952,8 @@ bool task_trymatch(task_template_t *tmpl, char ***line) { */ if (!(execute = fs_file_open(tmpl->tempfilename, "r"))) return false; + + preprocessing = true; } /* @@ -944,7 +970,10 @@ bool task_trymatch(task_template_t *tmpl, char ***line) { tmpl->description, tmpl->rulesfile ); - pclose(execute); + if (preprocessing) + fs_file_close(execute); + else + pclose(execute); return false; } @@ -972,7 +1001,7 @@ bool task_trymatch(task_template_t *tmpl, char ***line) { /* * Copy to output vector for diagnostics if execution match * fails. - */ + */ vec_push(*line, data); /* reset */ @@ -983,7 +1012,7 @@ bool task_trymatch(task_template_t *tmpl, char ***line) { data = NULL; } - if (strcmp(tmpl->proceduretype, "-pp")) + if (!preprocessing) pclose(execute); else fs_file_close(execute); @@ -1017,12 +1046,12 @@ void task_schedualize(size_t *pad) { size_t i = 0; size_t j = 0; - snprintf(space[0], sizeof(space[0]), "%d", (int)vec_size(task_tasks)); + util_snprintf(space[0], sizeof(space[0]), "%d", (int)vec_size(task_tasks)); for (; i < vec_size(task_tasks); i++) { memset(space[1], 0, sizeof(space[1])); - snprintf(space[1], sizeof(space[1]), "%d", (int)(i + 1)); - + util_snprintf(space[1], sizeof(space[1]), "%d", (int)(i + 1)); + 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); @@ -1086,7 +1115,7 @@ void task_schedualize(size_t *pad) { task_tasks[i].tmpl->rulesfile, (pad[1] + pad[2] - strlen(task_tasks[i].tmpl->rulesfile)) + (strlen(task_type(task_tasks[i].tmpl)) - pad[2]), task_type(task_tasks[i].tmpl) - + ); continue; } @@ -1094,7 +1123,7 @@ void task_schedualize(size_t *pad) { /* * If we made it here that concludes the task is to be executed * in the virtual machine (or the preprocessor output needs to - * be matched). + * be matched). */ if (!task_trymatch(task_tasks[i].tmpl, &match)) { size_t d = 0; @@ -1136,7 +1165,7 @@ void task_schedualize(size_t *pad) { * Print the non-expected out (since we are simply not expecting it) * This will help track down bugs in template files that fail to match * something. - */ + */ if (vec_size(match) > vec_size(task_tasks[i].tmpl->comparematch)) { for (d = 0; d < vec_size(match) - vec_size(task_tasks[i].tmpl->comparematch); d++) { con_out(" Expected: Nothing | Got: \"%s\"\n", @@ -1144,7 +1173,7 @@ void task_schedualize(size_t *pad) { ); } } - + for (j = 0; j < vec_size(match); j++) mem_d(match[j]); @@ -1161,7 +1190,7 @@ void task_schedualize(size_t *pad) { task_tasks[i].tmpl->rulesfile, (pad[1] + pad[2] - strlen(task_tasks[i].tmpl->rulesfile)) + (strlen(task_type(task_tasks[i].tmpl))- pad[2]), task_type(task_tasks[i].tmpl) - + ); } mem_d(data); @@ -1192,11 +1221,11 @@ GMQCC_WARN bool test_perform(const char *curdir, const char *defs) { /* * If the default definition file isn't set to anything. We will * use the default_defs here, which is "defs.qc" - */ + */ if (!defs) { defs = default_defs; } - + task_precleanup(curdir); if (!task_propagate(curdir, pad, defs)) {