* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
+#define GMQCC_PLATFORM_HEADER /* TODO: eliminate! */
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include "gmqcc.h"
-
-opts_cmd_t opts;
+#include "platform.h"
static const char *task_bins[] = {
"./gmqcc",
#include <dirent.h>
#include <unistd.h>
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];
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);
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;
return status;
}
#else
+ #include <sys/stat.h>
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));
- tmpnam(open->name_err);
- tmpnam(open->name_out);
+ util_tmpnam(open->name_err);
+ util_tmpnam(open->name_out);
(void)mode; /* excluded */
return open->handles;
}
- static void 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);
mem_d(open);
+
+ return EXIT_SUCCESS;
}
+# define popen _popen
+# define pclose _pclose
#endif /*! _WIN32 */
#define TASK_COMPILE 0
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;
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'))
goto failure;
}
- if (value && (*value == ' ' || *value == '\t'))
- value++;
-
/*
* Value will contain a newline character at the end, we need to strip
* this otherwise kaboom, seriously, kaboom :P
/* 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);
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);
}
/*
*/
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;
*/
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;
char **directories = NULL;
char *claim = util_strdup(curdir);
size_t i;
-
+
vec_push(directories, claim);
dir = fs_dir_open(claim);
*/
while ((files = fs_dir_read(dir))) {
util_asprintf(&claim, "%s/%s", curdir, files->d_name);
- if (stat(claim, &directory) == -1)
+ if (stat(claim, &directory) == -1) {
+ fs_dir_close(dir);
+ mem_d(claim);
return false;
-
+ }
+
if (S_ISDIR(directory.st_mode) && files->d_name[0] != '.') {
vec_push(directories, claim);
} else {
*/
for (i = 0; i < vec_size(directories); i++) {
dir = fs_dir_open(directories[i]);
-
+
while ((files = fs_dir_read(dir))) {
util_snprintf(buffer, sizeof(buffer), "%s/%s", directories[i], files->d_name);
if (stat(buffer, &directory) == -1) {
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;
- 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);
* 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
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.
vec_push(task_tasks, task);
}
}
-
+
fs_dir_close(dir);
mem_d(directories[i]); /* free claimed memory */
}
vec_free(directories);
- util_debug("TEST", "compiled %d task template files out of %d\n",
- vec_size(task_tasks),
- found
- );
-
return success;
}
* 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);
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);
}
}
* 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);
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);
}
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);
}
static bool task_trymatch(size_t i, char ***line) {
bool success = true;
bool process = true;
- FILE *execute;
+ int retval = EXIT_SUCCESS;
+ fs_file_t *execute;
char buffer[4096];
task_template_t *tmpl = task_tasks[i].tmpl;
-
+
memset (buffer,0,sizeof(buffer));
if (!strcmp(tmpl->proceduretype, "-execute")) {
);
}
- util_debug("TEST", "executing qcvm: `%s` [%s]\n",
- tmpl->description,
- buffer
- );
-
- execute = popen(buffer, "r");
+ execute = (fs_file_t*)popen(buffer, "r");
if (!execute)
return false;
} else if (!strcmp(tmpl->proceduretype, "-pp")) {
*/
if (!(execute = fs_file_open(task_tasks[i].stderrlogfile, "r")))
return false;
-
+
process = false;
}
char *data = NULL;
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,
if (!process)
fs_file_close(execute);
else
- pclose(execute);
+ pclose((FILE*)execute);
return false;
}
*/
if (strrchr(data, '\n'))
*strrchr(data, '\n') = '\0';
-
+
/*
* We remove the file/directory and stuff from the error
* match messages when testing diagnostics.
}
/*
- * 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) {
data = NULL;
size = 0;
}
+
+ if (compare != vec_size(tmpl->comparematch))
+ success = false;
+
mem_d(data);
data = NULL;
}
if (process)
- pclose(execute);
+ retval = pclose((FILE*)execute);
else
fs_file_close(execute);
- return success;
+ return success && retval == EXIT_SUCCESS;
}
static const char *task_type(task_template_t *tmpl) {
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.
*/
-
+
/* diagnostic is not executed, but compare tested instead, like preproessor */
execute = !! (!strcmp(task_tasks[i].tmpl->proceduretype, "-execute")) ||
(!strcmp(task_tasks[i].tmpl->proceduretype, "-pp")) ||
* 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")) {
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.
}
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")) {
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,
failed++;
continue;
}
-
+
for (j = 0; j < vec_size(match); j++)
mem_d(match[j]);
vec_free(match);
succeed = test_perform("tests", defs);
stat_info();
-
return (succeed) ? EXIT_SUCCESS : EXIT_FAILURE;
}
projects / xonotic / gmqcc.git / blobdiff