X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=test.c;h=0e1a466074abf2440481890b55200f1cadf094f5;hp=fdf3777f4f0af16363a5f6170ab2749742240f16;hb=b640049912e2a8caa5164a9718ad5a7903600d70;hpb=c2cf41baf95c7a45789e4c73202928baf9e9b650 diff --git a/test.c b/test.c index fdf3777..0e1a466 100644 --- a/test.c +++ b/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 + * Copyright (C) 2012, 2013, 2014, 2015 * Dale Weiler * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -20,12 +20,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#define GMQCC_PLATFORM_HEADER /* TODO: eliminate! */ #include #include -#include -#include #include "gmqcc.h" +#include "platform.h" static const char *task_bins[] = { "./gmqcc", @@ -53,15 +53,15 @@ static const char *task_bins[] = { #include #include typedef struct { - FILE *handles[3]; - int pipes [3]; + fs_file_t *handles[3]; + int pipes [3]; int stderr_fd; int stdout_fd; int pid; } popen_t; -static FILE ** task_popen(const char *command, const char *mode) { +static fs_file_t **task_popen(const char *command, const char *mode) { int inhandle [2]; int outhandle [2]; int errhandle [2]; @@ -85,7 +85,7 @@ static FILE ** task_popen(const char *command, const char *mode) { while (*line != '\0' && *line != ' ' && *line != '\t' && *line != '\n') line++; } - vec_push(argv, '\0'); + vec_push(argv, (char *)0); } @@ -103,9 +103,9 @@ static FILE ** task_popen(const char *command, const char *mode) { data->pipes [1] = outhandle[0]; data->pipes [2] = errhandle[0]; - data->handles[0] = fdopen(inhandle [1], "w"); - data->handles[1] = fdopen(outhandle[0], mode); - data->handles[2] = fdopen(errhandle[0], mode); + data->handles[0] = (fs_file_t*)fdopen(inhandle [1], "w"); + data->handles[1] = (fs_file_t*)fdopen(outhandle[0], mode); + data->handles[2] = (fs_file_t*)fdopen(errhandle[0], mode); /* sigh */ vec_free(argv); @@ -137,7 +137,7 @@ task_popen_error_0: return NULL; } -static int task_pclose(FILE **handles) { +static int task_pclose(fs_file_t **handles) { popen_t *data = (popen_t*)handles; int status = 0; @@ -152,23 +152,19 @@ static int task_pclose(FILE **handles) { return status; } #else + #include typedef struct { - FILE *handles[3]; - char name_err[L_tmpnam]; - char name_out[L_tmpnam]; + fs_file_t *handles[3]; + char name_err[L_tmpnam]; + char name_out[L_tmpnam]; } popen_t; - static FILE **task_popen(const char *command, const char *mode) { + static fs_file_t **task_popen(const char *command, const char *mode) { char *cmd = NULL; popen_t *open = (popen_t*)mem_a(sizeof(popen_t)); -#ifndef _MSC_VER tmpnam(open->name_err); tmpnam(open->name_out); -#else - tmpnam_s(open->name_err, L_tmpnam); - tmpnam_s(open->name_out, L_tmpnam); -#endif (void)mode; /* excluded */ @@ -184,10 +180,12 @@ static int task_pclose(FILE **handles) { return open->handles; } - static int task_pclose(FILE **files) { + static int task_pclose(fs_file_t **files) { popen_t *open = ((popen_t*)files); + fs_file_close(files[1]); fs_file_close(files[2]); + remove(open->name_err); remove(open->name_out); @@ -363,7 +361,7 @@ static bool task_template_generate(task_template_t *tmpl, char tag, const char * return true; } -static bool task_template_parse(const char *file, task_template_t *tmpl, FILE *fp, size_t *pad) { +static bool task_template_parse(const char *file, task_template_t *tmpl, fs_file_t *fp, size_t *pad) { char *data = NULL; char *back = NULL; size_t size = 0; @@ -373,7 +371,7 @@ static bool task_template_parse(const char *file, task_template_t *tmpl, FILE *f return false; /* top down parsing */ - while (fs_file_getline(&back, &size, fp) != EOF) { + while (fs_file_getline(&back, &size, fp) != FS_FILE_EOF) { /* skip whitespace */ data = back; if (*data && (*data == ' ' || *data == '\t')) @@ -504,7 +502,7 @@ static task_template_t *task_template_compile(const char *file, const char *dir, /* a page should be enough */ char fullfile[4096]; size_t filepadd = 0; - FILE *tempfile = NULL; + fs_file_t *tempfile = NULL; task_template_t *tmpl = NULL; util_snprintf(fullfile, sizeof(fullfile), "%s/%s", dir, file); @@ -659,9 +657,9 @@ static void task_template_destroy(task_template_t *tmpl) { */ typedef struct { task_template_t *tmpl; - FILE **runhandles; - FILE *stderrlog; - FILE *stdoutlog; + fs_file_t **runhandles; + fs_file_t *stderrlog; + fs_file_t *stdoutlog; char *stdoutlogfile; char *stderrlogfile; bool compiled; @@ -675,8 +673,8 @@ static task_t *task_tasks = NULL; */ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { bool success = true; - DIR *dir; - struct dirent *files; + fs_dir_t *dir; + fs_dirent_t *files; struct stat directory; char buffer[4096]; size_t found = 0; @@ -733,9 +731,11 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { if (strcmp(files->d_name + strlen(files->d_name) - 5, ".tmpl") == 0) { task_template_t *tmpl = task_template_compile(files->d_name, directories[i], pad); char buf[4096]; /* one page should be enough */ - char *qcflags = NULL; + const char *qcflags = NULL; task_t task; + memset(&task, 0, sizeof(task)); + found ++; if (!tmpl) { con_err("error compiling task template: %s\n", files->d_name); @@ -747,23 +747,14 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { * so we don't trample over an existing one. */ tmpl->tempfilename = NULL; - util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s", directories[i], files->d_name); + util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s.dat", directories[i], files->d_name); /* * Additional QCFLAGS enviroment variable may be used * 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 + qcflags = platform_getenv("QCFLAGS"); /* * Generate the command required to open a pipe to a process @@ -817,19 +808,21 @@ static 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")) { - util_snprintf(buf, sizeof(buf), "%s -E %s/%s -o %s", + util_snprintf(buf, sizeof(buf), "%s -E %s/%s %s -o %s", task_bins[TASK_COMPILE], directories[i], tmpl->sourcefile, + tmpl->compileflags, tmpl->tempfilename ); } else { - util_snprintf(buf, sizeof(buf), "%s -E %s/%s %s/%s -o %s", + util_snprintf(buf, sizeof(buf), "%s -E %s/%s %s/%s %s -o %s", task_bins[TASK_COMPILE], curdir, defs, directories[i], tmpl->sourcefile, + tmpl->compileflags, tmpl->tempfilename ); } @@ -881,16 +874,17 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) { * left behind from a previous invoke of the test-suite. */ static void task_precleanup(const char *curdir) { - DIR *dir; - struct dirent *files; - char buffer[4096]; + fs_dir_t *dir; + fs_dirent_t *files; + char buffer[4096]; dir = fs_dir_open(curdir); while ((files = fs_dir_read(dir))) { if (strstr(files->d_name, "TMP") || strstr(files->d_name, ".stdout") || - strstr(files->d_name, ".stderr")) + strstr(files->d_name, ".stderr") || + strstr(files->d_name, ".dat")) { util_snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); if (remove(buffer)) @@ -949,7 +943,7 @@ static bool task_trymatch(size_t i, char ***line) { bool success = true; bool process = true; int retval = EXIT_SUCCESS; - FILE *execute; + fs_file_t *execute; char buffer[4096]; task_template_t *tmpl = task_tasks[i].tmpl; @@ -973,7 +967,7 @@ static bool task_trymatch(size_t i, char ***line) { ); } - execute = popen(buffer, "r"); + execute = (fs_file_t*)popen(buffer, "r"); if (!execute) return false; } else if (!strcmp(tmpl->proceduretype, "-pp")) { @@ -1006,7 +1000,7 @@ static bool task_trymatch(size_t i, char ***line) { size_t size = 0; size_t compare = 0; - while (fs_file_getline(&data, &size, execute) != EOF) { + while (fs_file_getline(&data, &size, execute) != FS_FILE_EOF) { if (!strcmp(data, "No main function found\n")) { con_err("test failure: `%s` (No main function found) [%s]\n", tmpl->description, @@ -1015,7 +1009,7 @@ static bool task_trymatch(size_t i, char ***line) { if (!process) fs_file_close(execute); else - pclose(execute); + pclose((FILE*)execute); return false; } @@ -1075,7 +1069,7 @@ static bool task_trymatch(size_t i, char ***line) { } if (process) - retval = pclose(execute); + retval = pclose((FILE*)execute); else fs_file_close(execute); @@ -1110,6 +1104,7 @@ static size_t task_schedualize(size_t *pad) { size_t i = 0; size_t j = 0; size_t failed = 0; + int status = 0; util_snprintf(space[0], sizeof(space[0]), "%d", (int)vec_size(task_tasks)); @@ -1139,7 +1134,7 @@ static size_t task_schedualize(size_t *pad) { * Read data from stdout first and pipe that stuff into a log file * then we do the same for stderr. */ - while (fs_file_getline(&data, &size, task_tasks[i].runhandles[1]) != EOF) { + while (fs_file_getline(&data, &size, task_tasks[i].runhandles[1]) != FS_FILE_EOF) { fs_file_puts(task_tasks[i].stdoutlog, data); if (strstr(data, "failed to open file")) { @@ -1147,7 +1142,7 @@ static size_t task_schedualize(size_t *pad) { execute = false; } } - while (fs_file_getline(&data, &size, task_tasks[i].runhandles[2]) != EOF) { + while (fs_file_getline(&data, &size, task_tasks[i].runhandles[2]) != FS_FILE_EOF) { /* * If a string contains an error we just dissalow execution * of it in the vm. @@ -1162,7 +1157,7 @@ static size_t task_schedualize(size_t *pad) { } fs_file_puts (task_tasks[i].stderrlog, data); - fflush(task_tasks[i].stderrlog); /* fast flush for read */ + fs_file_flush(task_tasks[i].stderrlog); /* fast flush for read */ } if (!task_tasks[i].compiled && strcmp(task_tasks[i].tmpl->proceduretype, "-fail")) { @@ -1177,7 +1172,9 @@ 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")) { + status = task_pclose(task_tasks[i].runhandles); + if ((!strcmp(task_tasks[i].tmpl->proceduretype, "-fail") && status == EXIT_SUCCESS) + || ( strcmp(task_tasks[i].tmpl->proceduretype, "-fail") && status == EXIT_FAILURE)) { 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]),