X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=test.c;h=5e99df404063de4b7d638cd3e6217107414f5f36;hp=e2283767822e55ca8fb7b30414da00b849410d65;hb=394f1deade325e27b38f4cac6862e66a450d0d00;hpb=93ae1a65fb7ca685f2f2d324aaa72c9ee7fd7333 diff --git a/test.c b/test.c index e228376..5e99df4 100644 --- a/test.c +++ b/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -23,10 +23,9 @@ #include "gmqcc.h" #include #include -#include -bool opts_memchk = false; -bool opts_debug = false; +opts_cmd_t opts; + char *task_bins[] = { "./gmqcc", "./qcvm" @@ -37,25 +36,25 @@ char *task_bins[] = { * this implements a unique bi-directional popen-like function that * allows reading data from both stdout and stderr. And writing to * stdin :) - * + * * Example of use: * FILE *handles[3] = task_popen("ls", "-l", "r"); * if (!handles) { perror("failed to open stdin/stdout/stderr to ls"); * // handles[0] = stdin * // handles[1] = stdout * // handles[2] = stderr - * + * * task_pclose(handles); // to close */ #ifndef _WIN32 #include #include - +#include #include typedef struct { FILE *handles[3]; int pipes [3]; - + int stderr_fd; int stdout_fd; int pid; @@ -66,9 +65,9 @@ FILE ** task_popen(const char *command, const char *mode) { int outhandle [2]; int errhandle [2]; int trypipe; - + popen_t *data = mem_a(sizeof(popen_t)); - + /* * Parse the command now into a list for execv, this is a pain * in the ass. @@ -76,36 +75,36 @@ FILE ** task_popen(const char *command, const char *mode) { char *line = (char*)command; char **argv = NULL; { - + while (*line != '\0') { while (*line == ' ' || *line == '\t' || *line == '\n') *line++ = '\0'; vec_push(argv, line); - + while (*line != '\0' && *line != ' ' && *line != '\t' && *line != '\n') line++; } vec_push(argv, '\0'); } - - + + if ((trypipe = pipe(inhandle)) < 0) goto task_popen_error_0; if ((trypipe = pipe(outhandle)) < 0) goto task_popen_error_1; if ((trypipe = pipe(errhandle)) < 0) goto task_popen_error_2; - + if ((data->pid = fork()) > 0) { /* parent */ close(inhandle [0]); close(outhandle [1]); close(errhandle [1]); - + data->pipes [0] = inhandle [1]; 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); - + /* sigh */ if (argv) vec_free(argv); @@ -115,23 +114,19 @@ FILE ** task_popen(const char *command, const char *mode) { close(inhandle [1]); close(outhandle[0]); close(errhandle[0]); - + /* see piping documentation for this sillyness :P */ close(0), dup(inhandle [0]); close(1), dup(outhandle[1]); close(2), dup(errhandle[1]); - + execvp(*argv, argv); - exit(1); + exit(EXIT_FAILURE); } else { /* fork failed */ goto task_popen_error_3; } - - if (argv) - vec_free(argv); - return data->handles; - + task_popen_error_3: close(errhandle[0]), close(errhandle[1]); task_popen_error_2: close(outhandle[0]), close(outhandle[1]); task_popen_error_1: close(inhandle [0]), close(inhandle [1]); @@ -145,19 +140,132 @@ task_popen_error_0: int task_pclose(FILE **handles) { popen_t *data = (popen_t*)handles; int status = 0; - + close(data->pipes[0]); /* stdin */ close(data->pipes[1]); /* stdout */ close(data->pipes[2]); /* stderr */ - + waitpid(data->pid, &status, 0); - + mem_d(data); - + return status; } #else +# define _WIN32_LEAN_AND_MEAN +# define popen _popen +# define pclose _pclose +# include +# include +# include + /* + * Bidirectional piping implementation for windows using CreatePipe and DuplicateHandle + + * other hacks. + */ + + typedef struct { + int __dummy; + /* TODO: implement */ + } popen_t; + + FILE **task_popen(const char *command, const char *mode) { + (void)command; + (void)mode; + /* TODO: implement */ + return NULL; + } + + void task_pclose(FILE **files) { + /* TODO: implement */ + (void)files; + return; + } + +# ifdef __MINGW32__ + /* mingw32 has dirent.h */ +# include +# elif defined (_WIN32) + /* + * visual studio lacks dirent.h it's a posix thing + * so we emulate it with the WinAPI. + */ + + struct dirent { + long d_ino; + unsigned short d_reclen; + unsigned short d_namlen; + char d_name[FILENAME_MAX]; + }; + + typedef struct { + struct _finddata_t dd_dta; + struct dirent dd_dir; + long dd_handle; + int dd_stat; + char dd_name[1]; + } DIR; + + DIR *opendir(const char *name) { + DIR *dir = (DIR*)mem_a(sizeof(DIR) + strlen(name)); + if (!dir) + return NULL; + + strcpy(dir->dd_name, name); + return dir; + } + + int closedir(DIR *dir) { + FindClose((HANDLE)dir->dd_handle); + mem_d ((void*)dir); + return 0; + } + + struct dirent *readdir(DIR *dir) { + WIN32_FIND_DATA info; + struct dirent *data; + int rets; + + if (!dir->dd_handle) { + char *dirname; + if (*dir->dd_name) { + size_t n = strlen(dir->dd_name); + if ((dirname = (char*)mem_a(n + 5) /* 4 + 1 */)) { + strcpy(dirname, dir->dd_name); + strcpy(dirname + n, "\\*.*"); /* 4 + 1 */ + } + } else { + if (!(dirname = util_strdup("\\*.*"))) + return NULL; + } + + dir->dd_handle = (long)FindFirstFile(dirname, &info); + mem_d(dirname); + rets = !(!dir->dd_handle); + } else if (dir->dd_handle != -11) { + rets = FindNextFile ((HANDLE)dir->dd_handle, &info); + } else { + rets = 0; + } + + if (!rets) + return NULL; + + if ((data = (struct dirent*)mem_a(sizeof(struct dirent)))) { + strncpy(data->d_name, info.cFileName, FILENAME_MAX - 1); + data->d_name[FILENAME_MAX - 1] = '\0'; /* terminate */ + data->d_namlen = strlen(data->d_name); + } + return data; + } + + /* + * Visual studio also lacks S_ISDIR for sys/stat.h, so we emulate this as well + * which is not hard at all. + */ +# undef S_ISDIR /* undef just incase */ +# define S_ISDIR(X) ((X)&_S_IFDIR) +# endif #endif #define TASK_COMPILE 0 @@ -171,29 +279,21 @@ int task_pclose(FILE **handles) { * the information for that test there is no way to properly "test" them. * Rules for these templates are described in a template file, using a * task template language. - * + * * The language is a basic finite statemachine, top-down single-line * description language. - * + * * The languge is composed entierly of "tags" which describe a string of * text for a task. Think of it much like a configuration file. Except * it's been designed to allow flexibility and future support for prodecual * semantics. - * + * * The following "tags" are suported by the language - * + * * D: * Used to set a description of the current test, this must be * provided, this tag is NOT optional. - * - * F: - * Used to set a failure message, this message will be displayed - * if the test fails, this tag is optional - * - * S: - * Used to set a success message, this message will be displayed - * if the test succeeds, this tag is optional. - * + * * T: * Used to set the procedure for the given task, there are two * options for this: @@ -201,73 +301,79 @@ int task_pclose(FILE **handles) { * This simply performs compilation only * -execute * This will perform compilation and execution - * + * -fail + * This will perform compilation, but requires + * the compilation to fail in order to succeed. + * * This must be provided, this tag is NOT optional. - * + * * C: * Used to set the compilation flags for the given task, this * must be provided, this tag is NOT optional. - * + * + * F: Used to set some test suite flags, currently the only option + * is -no-defs (to including of defs.qh) + * * E: * Used to set the execution flags for the given task. This tag * must be provided if T == -execute, otherwise it's erroneous - * as compilation only takes place. - * + * as compilation only takes place. + * * M: * Used to describe a string of text that should be matched from * the output of executing the task. If this doesn't match the * task fails. This tag must be provided if T == -execute, otherwise * it's erroneous as compilation only takes place. - * + * * I: * Used to specify the INPUT source file to operate on, this must be * provided, this tag is NOT optional * - * + * * Notes: * These tags have one-time use, using them more than once will result * in template compilation errors. - * + * * Lines beginning with # or // in the template file are comments and * are ignored by the template parser. - * + * * Whitespace is optional, with exception to the colon ':' between the * tag and it's assignment value/ - * + * * The template compiler will detect erronrous tags (optional tags * that need not be set), as well as missing tags, and error accordingly * this will result in the task failing. */ typedef struct { char *description; - char *failuremessage; - char *successmessage; char *compileflags; char *executeflags; char *proceduretype; char *sourcefile; char *tempfilename; char **comparematch; + char *rulesfile; + char *testflags; } task_template_t; /* * This is very much like a compiler code generator :-). This generates * a value from some data observed from the compiler. */ -bool task_template_generate(task_template_t *template, char tag, const char *file, size_t line, const char *value) { +bool task_template_generate(task_template_t *template, char tag, const char *file, size_t line, const char *value, size_t *pad) { + size_t desclen = 0; char **destval = NULL; - + if (!template) return false; - + switch(tag) { case 'D': destval = &template->description; break; - case 'F': destval = &template->failuremessage; break; - case 'S': destval = &template->successmessage; break; case 'T': destval = &template->proceduretype; break; case 'C': destval = &template->compileflags; break; case 'E': destval = &template->executeflags; break; case 'I': destval = &template->sourcefile; break; + case 'F': destval = &template->testflags; break; default: con_printmsg(LVL_ERROR, __FILE__, __LINE__, "internal error", "invalid tag `%c:` during code generation\n", @@ -275,7 +381,7 @@ bool task_template_generate(task_template_t *template, char tag, const char *fil ); return false; } - + /* * Ensure if for the given tag, there already exists a * assigned value. @@ -287,45 +393,58 @@ bool task_template_generate(task_template_t *template, char tag, const char *fil ); return false; } - + /* * Strip any whitespace that might exist in the value for assignments * like "D: foo" */ if (value && *value && (*value == ' ' || *value == '\t')) value++; - + /* * Value will contain a newline character at the end, we need to strip * this otherwise kaboom, seriously, kaboom :P */ - *strrchr(value, '\n')='\0'; - + if (strchr(value, '\n')) + *strrchr(value, '\n')='\0'; + else /* cppcheck: possible nullpointer dereference */ + abort(); + /* * Now allocate and set the actual value for the specific tag. Which * was properly selected and can be accessed with *destval. */ *destval = util_strdup(value); - + + + if (*destval == template->description) { + /* + * Create some padding for the description to align the + * printing of the rules file. + */ + if ((desclen = strlen(template->description)) > pad[0]) + pad[0] = desclen; + } + return true; } -bool task_template_parse(const char *file, task_template_t *template, FILE *fp) { +bool task_template_parse(const char *file, task_template_t *template, FILE *fp, size_t *pad) { char *data = NULL; char *back = NULL; size_t size = 0; size_t line = 1; - + if (!template) return false; - + /* top down parsing */ - while (util_getline(&back, &size, fp) != EOF) { + while (file_getline(&back, &size, fp) != EOF) { /* skip whitespace */ data = back; if (*data && (*data == ' ' || *data == '\t')) data++; - + switch (*data) { /* * Handle comments inside task template files. We're strict @@ -335,13 +454,13 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp) if (data[1] != '/') { con_printmsg(LVL_ERROR, file, line, "template parse error", "invalid character `/`, perhaps you meant `//` ?"); - + mem_d(back); return false; } case '#': break; - + /* * Empty newlines are acceptable as well, so we handle that here * despite being just odd since there should't be that many @@ -350,19 +469,18 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp) case '\r': case '\n': break; - - + + /* * Now begin the actual "tag" stuff. This works as you expect * it to. */ case 'D': - case 'F': - case 'S': case 'T': case 'C': case 'E': case 'I': + case 'F': if (data[1] != ':') { con_printmsg(LVL_ERROR, file, line, "template parse error", "expected `:` after `%c`", @@ -370,14 +488,14 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp) ); goto failure; } - if (!task_template_generate(template, *data, file, line, &data[3])) { + if (!task_template_generate(template, *data, file, line, &data[3], pad)) { con_printmsg(LVL_ERROR, file, line, "template compile error", "failed to generate for given task\n" ); goto failure; } break; - + /* * Match requires it's own system since we allow multiple M's * for multi-line matching. @@ -392,21 +510,24 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp) ); goto failure; } - + if (value && *value && (*value == ' ' || *value == '\t')) value++; - + /* * Value will contain a newline character at the end, we need to strip * this otherwise kaboom, seriously, kaboom :P */ - *strrchr(value, '\n')='\0'; - + if (strrchr(value, '\n')) + *strrchr(value, '\n')='\0'; + else /* cppcheck: possible null pointer dereference */ + abort(); + vec_push(template->comparematch, util_strdup(value)); - + break; } - + default: con_printmsg(LVL_ERROR, file, line, "template parse error", "invalid tag `%c`", *data @@ -414,7 +535,7 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp) goto failure; /* no break required */ } - + /* update line and free old sata */ line++; mem_d(back); @@ -423,7 +544,7 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp) if (back) mem_d(back); return true; - + failure: if (back) mem_d (back); @@ -437,31 +558,41 @@ failure: void task_template_nullify(task_template_t *template) { if (!template) return; - + template->description = NULL; - template->failuremessage = NULL; - template->successmessage = NULL; template->proceduretype = NULL; template->compileflags = NULL; template->executeflags = NULL; template->comparematch = NULL; template->sourcefile = NULL; template->tempfilename = NULL; + template->rulesfile = NULL; + template->testflags = NULL; } -task_template_t *task_template_compile(const char *file, const char *dir) { +task_template_t *task_template_compile(const char *file, const char *dir, size_t *pad) { /* a page should be enough */ char fullfile[4096]; + size_t filepadd = 0; FILE *tempfile = NULL; task_template_t *template = NULL; - + memset (fullfile, 0, sizeof(fullfile)); snprintf(fullfile, sizeof(fullfile), "%s/%s", dir, file); - - tempfile = fopen(fullfile, "r"); - template = mem_a(sizeof(task_template_t)); + + tempfile = file_open(fullfile, "r"); + template = mem_a(sizeof(task_template_t)); task_template_nullify(template); - + + /* + * 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; + + template->rulesfile = util_strdup(fullfile); + /* * Esnure the file even exists for the task, this is pretty useless * to even do. @@ -472,12 +603,12 @@ task_template_t *task_template_compile(const char *file, const char *dir) { ); goto failure; } - - if (!task_template_parse(file, template, tempfile)) { + + if (!task_template_parse(file, template, tempfile, pad)) { con_err("template parse error: error during parsing\n"); goto failure; } - + /* * Regardless procedure type, the following tags must exist: * D @@ -501,7 +632,7 @@ task_template_t *task_template_compile(const char *file, const char *dir) { con_err("template compile error: %s missing `I:` tag\n", file); goto failure; } - + /* * Now lets compile the template, compilation is really just * the process of validating the input. @@ -521,39 +652,45 @@ task_template_t *task_template_compile(const char *file, const char *dir) { con_err("template compile error: %s missing `M:` tag (use `$null` for exclude)\n", file); goto failure; } + } else if (!strcmp(template->proceduretype, "-fail")) { + if (template->executeflags) + con_err("template compile warning: %s erroneous tag `E:` when only failing\n", file); + if (template->comparematch) + con_err("template compile warning: %s erroneous tag `M:` when only failing\n", file); + goto success; } else { con_err("template compile error: %s invalid procedure type: %s\n", file, template->proceduretype); goto failure; } - + success: - fclose(tempfile); + file_close(tempfile); return template; - + failure: /* * The file might not exist and we jump here when that doesn't happen * so the check to see if it's not null here is required. */ if (tempfile) - fclose(tempfile); + file_close(tempfile); mem_d (template); - + return NULL; } void task_template_destroy(task_template_t **template) { if (!template) return; - + if ((*template)->description) mem_d((*template)->description); - if ((*template)->failuremessage) mem_d((*template)->failuremessage); - if ((*template)->successmessage) mem_d((*template)->successmessage); if ((*template)->proceduretype) mem_d((*template)->proceduretype); if ((*template)->compileflags) mem_d((*template)->compileflags); if ((*template)->executeflags) mem_d((*template)->executeflags); if ((*template)->sourcefile) mem_d((*template)->sourcefile); - + if ((*template)->rulesfile) mem_d((*template)->rulesfile); + if ((*template)->testflags) mem_d((*template)->testflags); + /* * Delete all allocated string for task template then destroy the * main vector. @@ -562,10 +699,10 @@ void task_template_destroy(task_template_t **template) { size_t i = 0; for (; i < vec_size((*template)->comparematch); i++) mem_d((*template)->comparematch[i]); - + vec_free((*template)->comparematch); } - + /* * Nullify all the template members otherwise NULL comparision * checks will fail if template pointer is reused. @@ -593,38 +730,41 @@ task_t *task_tasks = NULL; * Read a directory and searches for all template files in it * which is later used to run all tests. */ -bool task_propagate(const char *curdir) { +bool task_propagate(const char *curdir, size_t *pad, const char *defs) { bool success = true; DIR *dir; struct dirent *files; struct stat directory; char buffer[4096]; - + size_t found = 0; + dir = opendir(curdir); - + while ((files = readdir(dir))) { memset (buffer, 0,sizeof(buffer)); snprintf(buffer, sizeof(buffer), "%s/%s", curdir, files->d_name); - + if (stat(buffer, &directory) == -1) { con_err("internal error: stat failed, aborting\n"); abort(); } - + /* skip directories */ if (S_ISDIR(directory.st_mode)) continue; - + /* * We made it here, which concludes the file/directory is not * actually a directory, so it must be a file :) */ if (strcmp(files->d_name + strlen(files->d_name) - 5, ".tmpl") == 0) { - task_template_t *template = task_template_compile(files->d_name, curdir); + task_template_t *template = task_template_compile(files->d_name, curdir, pad); char buf[4096]; /* one page should be enough */ + char *qcflags = NULL; task_t task; - + util_debug("TEST", "compiling task template: %s/%s\n", curdir, files->d_name); + found ++; if (!template) { con_err("error compiling task template: %s\n", files->d_name); success = false; @@ -635,21 +775,64 @@ bool task_propagate(const char *curdir) { * so we don't trample over an existing one. */ template->tempfilename = tempnam(curdir, "TMPDAT"); - + + /* + * 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) + */ + qcflags = getenv("QCFLAGS"); + /* * Generate the command required to open a pipe to a process * which will be refered to with a handle in the task for * reading the data from the pipe. */ - memset (buf,0,sizeof(buf)); - snprintf(buf, sizeof(buf), "%s %s/%s %s -o %s", - task_bins[TASK_COMPILE], - curdir, - template->sourcefile, - template->compileflags, - template->tempfilename - ); - + memset (buf,0,sizeof(buf)); + if (qcflags) { + if (template->testflags && !strcmp(template->testflags, "-no-defs")) { + snprintf(buf, sizeof(buf), "%s %s/%s %s %s -o %s", + task_bins[TASK_COMPILE], + curdir, + template->sourcefile, + qcflags, + template->compileflags, + template->tempfilename + ); + } else { + snprintf(buf, sizeof(buf), "%s %s/%s %s/%s %s %s -o %s", + task_bins[TASK_COMPILE], + curdir, + defs, + curdir, + template->sourcefile, + qcflags, + template->compileflags, + template->tempfilename + ); + } + } else { + if (template->testflags && !strcmp(template->testflags, "-no-defs")) { + snprintf(buf, sizeof(buf), "%s %s/%s %s -o %s", + task_bins[TASK_COMPILE], + curdir, + template->sourcefile, + template->compileflags, + template->tempfilename + ); + } else { + snprintf(buf, sizeof(buf), "%s %s/%s %s/%s %s -o %s", + task_bins[TASK_COMPILE], + curdir, + defs, + curdir, + template->sourcefile, + template->compileflags, + template->tempfilename + ); + } + } + /* * The task template was compiled, now lets create a task from * the template data which has now been propagated. @@ -660,9 +843,9 @@ bool task_propagate(const char *curdir) { success = false; continue; } - + util_debug("TEST", "executing test: `%s` [%s]\n", template->description, buf); - + /* * Open up some file desciptors for logging the stdout/stderr * to our own. @@ -670,50 +853,30 @@ bool task_propagate(const char *curdir) { memset (buf,0,sizeof(buf)); snprintf(buf, sizeof(buf), "%s.stdout", template->tempfilename); task.stdoutlogfile = util_strdup(buf); - if (!(task.stdoutlog = fopen(buf, "w"))) { + if (!(task.stdoutlog = file_open(buf, "w"))) { con_err("error opening %s for stdout\n", buf); continue; } - + memset (buf,0,sizeof(buf)); snprintf(buf, sizeof(buf), "%s.stderr", template->tempfilename); task.stderrlogfile = util_strdup(buf); - if (!(task.stderrlog = fopen(buf, "w"))) { + if (!(task.stderrlog = file_open(buf, "w"))) { con_err("error opening %s for stderr\n", buf); continue; } - + vec_push(task_tasks, task); } } - - closedir(dir); - return success; -} -/* - * Removes all temporary 'progs.dat' files created during compilation - * of all tests' - */ -void task_cleanup(const char *curdir) { - DIR *dir; - struct dirent *files; - char buffer[4096]; + util_debug("TEST", "compiled %d task template files out of %d\n", + vec_size(task_tasks), + found + ); - dir = opendir(curdir); - - while ((files = readdir(dir))) { - memset(buffer, 0, sizeof(buffer)); - if (strstr(files->d_name, "TMP")) { - 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); - } - } - closedir(dir); + return success; } /* @@ -726,7 +889,7 @@ void task_precleanup(const char *curdir) { char buffer[4096]; dir = opendir(curdir); - + while ((files = readdir(dir))) { memset(buffer, 0, sizeof(buffer)); if (strstr(files->d_name, "TMP") || @@ -740,11 +903,11 @@ void task_precleanup(const char *curdir) { util_debug("TEST", "removed temporary file: %s\n", buffer); } } - + closedir(dir); } -void task_destroy(const char *curdir) { +void task_destroy(void) { /* * Free all the data in the task list and finally the list itself * then proceed to cleanup anything else outside the program like @@ -757,37 +920,34 @@ void task_destroy(const char *curdir) { * 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) fclose (task_tasks[i].stdoutlog); - if (task_tasks[i].stderrlog) fclose (task_tasks[i].stderrlog); - + if (task_tasks[i].stdoutlog) file_close (task_tasks[i].stdoutlog); + if (task_tasks[i].stderrlog) file_close (task_tasks[i].stderrlog); + /* * Only remove the log files if the test actually compiled otherwise - * forget about it. + * forget about it (or if it didn't compile, and the procedure type + * was set to -fail (meaning it shouldn't compile) .. stil remove) */ - if (task_tasks[i].compiled) { + if (task_tasks[i].compiled || !strcmp(task_tasks[i].template->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); + + remove(task_tasks[i].template->tempfilename); } - + /* free util_strdup data for log files */ mem_d(task_tasks[i].stdoutlogfile); mem_d(task_tasks[i].stderrlogfile); - + task_template_destroy(&task_tasks[i].template); } vec_free(task_tasks); - - /* - * Cleanup outside stuff like temporary files. - */ - task_cleanup(curdir); } /* @@ -795,12 +955,12 @@ void task_destroy(const char *curdir) { * using the template passed into it for call-flags and user defined * messages. */ -bool task_execute(task_template_t *template) { - bool success = false; +bool task_execute(task_template_t *template, char ***line) { + bool success = true; FILE *execute; char buffer[4096]; memset (buffer,0,sizeof(buffer)); - + /* * Drop the execution flags for the QCVM if none where * actually specified. @@ -817,16 +977,16 @@ bool task_execute(task_template_t *template) { template->tempfilename ); } - + util_debug("TEST", "executing qcvm: `%s` [%s]\n", template->description, buffer ); - + execute = popen(buffer, "r"); if (!execute) return false; - + /* * Now lets read the lines and compare them to the matches we expect * and handle accordingly. @@ -835,30 +995,39 @@ bool task_execute(task_template_t *template) { char *data = NULL; size_t size = 0; size_t compare = 0; - while (util_getline(&data, &size, execute) != EOF) { + while (file_getline(&data, &size, execute) != EOF) { if (!strcmp(data, "No main function found\n")) { - con_err("test failure: `%s` [%s] (No main function found)\n", + con_err("test failure: `%s` (No main function found) [%s]\n", template->description, - (template->failuremessage) ? - template->failuremessage : "unknown" + template->rulesfile ); pclose(execute); return false; } - - /* + + /* * Trim newlines from data since they will just break our * ability to properly validate matches. */ if (strrchr(data, '\n')) *strrchr(data, '\n') = '\0'; - - + + if (vec_size(template->comparematch) > compare) { + if (strcmp(data, template->comparematch[compare++])) + success = false; + } else { + success = false; + } + /* - * We only care about the last line from the output for now - * implementing multi-line match is TODO. - */ - success = !!!(strcmp(data, template->comparematch[compare++])); + * Copy to output vector for diagnostics if execution match + * fails. + */ + vec_push(*line, data); + + /* reset */ + data = NULL; + size = 0; } mem_d(data); data = NULL; @@ -873,39 +1042,49 @@ bool task_execute(task_template_t *template) { * execution this takes more work since a task needs to be generated * from thin air and executed INLINE. */ -void task_schedualize() { +void task_schedualize(size_t *pad) { bool execute = false; char *data = NULL; + char **match = NULL; size_t size = 0; size_t i; - + size_t j; + + util_debug("TEST", "found %d tasks, preparing to execute\n", vec_size(task_tasks)); + for (i = 0; i < vec_size(task_tasks); i++) { + util_debug("TEST", "executing task: %d: %s\n", i, task_tasks[i].template->description); /* * Generate a task from thin air if it requires execution in * the QCVM. */ - if (!strcmp(task_tasks[i].template->proceduretype, "-execute")) - execute = true; - + execute = !!(!strcmp(task_tasks[i].template->proceduretype, "-execute")); + /* * We assume it compiled before we actually compiled :). On error * we change the value */ task_tasks[i].compiled = true; - + /* * Read data from stdout first and pipe that stuff into a log file * then we do the same for stderr. - */ - while (util_getline(&data, &size, task_tasks[i].runhandles[1]) != EOF) { - fputs(data, task_tasks[i].stdoutlog); + */ + while (file_getline(&data, &size, task_tasks[i].runhandles[1]) != EOF) { + file_puts(task_tasks[i].stdoutlog, data); + + if (strstr(data, "failed to open file")) { + task_tasks[i].compiled = false; + execute = false; + } + fflush(task_tasks[i].stdoutlog); } - while (util_getline(&data, &size, task_tasks[i].runhandles[2]) != EOF) { + while (file_getline(&data, &size, task_tasks[i].runhandles[2]) != EOF) { /* * If a string contains an error we just dissalow execution * of it in the vm. - * + * * TODO: make this more percise, e.g if we print a warning * that refers to a variable named error, or something like * that .. then this will blowup :P @@ -914,37 +1093,92 @@ void task_schedualize() { execute = false; task_tasks[i].compiled = false; } - - fputs(data, task_tasks[i].stderrlog); + + file_puts(task_tasks[i].stderrlog, data); fflush(task_tasks[i].stdoutlog); } - - /* - * If we can execute we do so after all data has been read and - * this paticular task has coupled execution in its procedure type - */ - if (!execute) + + if (!task_tasks[i].compiled && strcmp(task_tasks[i].template->proceduretype, "-fail")) { + con_err("test failure: `%s` (failed to compile) see %s.stdout and %s.stderr [%s]\n", + task_tasks[i].template->description, + task_tasks[i].template->tempfilename, + task_tasks[i].template->tempfilename, + task_tasks[i].template->rulesfile + ); continue; - + } + + if (!execute) { + con_out("test succeeded: `%s` %*s\n", + task_tasks[i].template->description, + (pad[0] + pad[1] - strlen(task_tasks[i].template->description)) + + (strlen(task_tasks[i].template->rulesfile) - pad[1]), + task_tasks[i].template->rulesfile + + ); + continue; + } + /* * If we made it here that concludes the task is to be executed * in the virtual machine. */ - if (!task_execute(task_tasks[i].template)) { - con_err("test failure: `%s` [%s] see %s.stdout and %s.stderr\n", + if (!task_execute(task_tasks[i].template, &match)) { + size_t d = 0; + + con_err("test failure: `%s` (invalid results from execution) [%s]\n", task_tasks[i].template->description, - (task_tasks[i].template->failuremessage) ? - task_tasks[i].template->failuremessage : "unknown", - task_tasks[i].template->tempfilename, - task_tasks[i].template->tempfilename + task_tasks[i].template->rulesfile + ); + + /* + * Print nicely formatted expected match lists to console error + * handler for the all the given matches in the template file and + * what was actually returned from executing. + */ + con_err(" Expected From %u Matches: (got %u Matches)\n", + vec_size(task_tasks[i].template->comparematch), + vec_size(match) ); + for (; d < vec_size(task_tasks[i].template->comparematch); d++) { + char *select = task_tasks[i].template->comparematch[d]; + size_t length = 40 - strlen(select); + + con_err(" Expected: \"%s\"", select); + while (length --) + con_err(" "); + con_err("| Got: \"%s\"\n", (d >= vec_size(match)) ? "<>" : match[d]); + } + + /* + * 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].template->comparematch)) { + for (d = 0; d < vec_size(match) - vec_size(task_tasks[i].template->comparematch); d++) { + con_err(" Expected: Nothing | Got: \"%s\"\n", + match[d + vec_size(task_tasks[i].template->comparematch)] + ); + } + } + + + for (j = 0; j < vec_size(match); j++) + mem_d(match[j]); + vec_free(match); continue; } - - con_out("test succeeded: `%s` [%s]\n", + for (j = 0; j < vec_size(match); j++) + mem_d(match[j]); + vec_free(match); + + con_out("test succeeded: `%s` %*s\n", task_tasks[i].template->description, - (task_tasks[i].template->successmessage) ? - task_tasks[i].template->successmessage : "unknown" + (pad[0] + pad[1] - strlen(task_tasks[i].template->description)) + + (strlen(task_tasks[i].template->rulesfile) - pad[1]), + task_tasks[i].template->rulesfile + ); } mem_d(data); @@ -958,17 +1192,32 @@ void task_schedualize() { * schedualizes them (executes them) and actually reports errors and * what not. It then proceeds to destroy the tasks and return memory * it's the engine :) - * + * * It returns true of tests could be propagated, otherwise it returns * false. - * + * * It expects con_init() was called before hand. */ -bool test_perform(const char *curdir) { +GMQCC_WARN bool test_perform(const char *curdir, const char *defs) { + static const char *default_defs = "defs.qh"; + + size_t pad[] = { + 0, 0 + }; + + /* + * 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)) { + if (!task_propagate(curdir, pad, defs)) { con_err("error: failed to propagate tasks\n"); - task_destroy(curdir); + task_destroy(); return false; } /* @@ -978,9 +1227,9 @@ bool test_perform(const char *curdir) { * it's designed to prevent lock contention, and possible syncronization * issues. */ - task_schedualize(); - task_destroy(curdir); - + task_schedualize(pad); + task_destroy(); + return true; } @@ -1015,10 +1264,13 @@ static bool parsecmd(const char *optname, int *argc_, char ***argv_, char **out, } int main(int argc, char **argv) { - char *redirout = (char*)stdout; - char *redirerr = (char*)stderr; + bool succeed = false; + char *redirout = (char*)stdout; + char *redirerr = (char*)stderr; + char *defs = NULL; + con_init(); - + /* * Command line option parsing commences now We only need to support * a few things in the test suite. @@ -1032,28 +1284,32 @@ int main(int argc, char **argv) { continue; if (parsecmd("redirerr", &argc, &argv, &redirerr, 1, false)) continue; - + if (parsecmd("defs", &argc, &argv, &defs, 1, false)) + continue; + con_change(redirout, redirerr); if (!strcmp(argv[0]+1, "debug")) { - opts_debug = true; + OPTS_OPTION_BOOL(OPTION_DEBUG) = true; continue; } if (!strcmp(argv[0]+1, "memchk")) { - opts_memchk = true; + OPTS_OPTION_BOOL(OPTION_MEMCHK) = true; continue; } if (!strcmp(argv[0]+1, "nocolor")) { con_color(0); continue; } - + con_err("invalid argument %s\n", argv[0]+1); return -1; } } con_change(redirout, redirerr); - test_perform("tests"); + succeed = test_perform("tests", defs); util_meminfo(); - return 0; + + + return (succeed) ? EXIT_SUCCESS : EXIT_FAILURE; }