+#include <vector>
+
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
popen_t *data = (popen_t*)mem_a(sizeof(popen_t));
- /*
- * Parse the command now into a list for execv, this is a pain
- * in the ass.
- */
- char *line = (char*)command;
- char **argv = NULL;
+ char *line = (char*)command;
+ std::vector<char *> argv;
{
while (*line != '\0') {
while (*line == ' ' || *line == '\t' || *line == '\n')
*line++ = '\0';
- vec_push(argv, line);
-
+ argv.push_back(line);
while (*line != '\0' && *line != ' ' &&
*line != '\t' && *line != '\n') line++;
}
- vec_push(argv, (char *)0);
+ argv.push_back((char *)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;
data->handles[0] = fdopen(inhandle [1], "w");
data->handles[1] = fdopen(outhandle[0], mode);
data->handles[2] = fdopen(errhandle[0], mode);
-
- /* sigh */
- vec_free(argv);
return data->handles;
} else if (data->pid == 0) {
/* child */
dup2(outhandle[1], 1);
dup2(errhandle[1], 2);
- execvp(*argv, argv);
- exit(EXIT_FAILURE);
+ execvp(argv[0], &argv[0]);
+ exit(95);
} else {
/* fork failed */
goto task_popen_error_3;
task_popen_error_1: close(inhandle [0]), close(inhandle [1]);
task_popen_error_0:
- vec_free(argv);
- return NULL;
+ return nullptr;
}
static int task_pclose(FILE **handles) {
close(data->pipes[1]); /* stdout */
close(data->pipes[2]); /* stderr */
- waitpid(data->pid, &status, 0);
+ if (data->pid != waitpid(data->pid, &status, 0)) {
+ abort();
+ }
+ if (!WIFEXITED(status))
+ return -1;
+ if (WIFSIGNALED(status))
+ con_out("got signaled!\n");
mem_d(data);
- return status;
+ return status ? 1 : 0;
}
#define TASK_COMPILE 0
* this will result in the task failing.
*/
struct task_template_t {
- char *description;
- char *compileflags;
- char *executeflags;
- char *proceduretype;
- char *sourcefile;
- char *tempfilename;
- char **comparematch;
- char *rulesfile;
- char *testflags;
+ char *description;
+ char *compileflags;
+ char *executeflags;
+ char *proceduretype;
+ char *sourcefile;
+ char *tempfilename;
+ std::vector<char *> comparematch;
+ char *rulesfile;
+ char *testflags;
};
/*
static bool task_template_generate(task_template_t *tmpl, char tag, const char *file, size_t line, char *value, size_t *pad) {
size_t desclen = 0;
size_t filelen = 0;
- char **destval = NULL;
+ char **destval = nullptr;
if (!tmpl)
return false;
}
static bool task_template_parse(const char *file, task_template_t *tmpl, FILE *fp, size_t *pad) {
- char *data = NULL;
- char *back = NULL;
+ char *data = nullptr;
+ char *back = nullptr;
size_t size = 0;
size_t line = 1;
else /* cppcheck: possible null pointer dereference */
exit(EXIT_FAILURE);
- vec_push(tmpl->comparematch, util_strdup(value));
+ tmpl->comparematch.push_back(util_strdup(value));
break;
}
/* update line and free old sata */
line++;
mem_d(back);
- back = NULL;
+ back = nullptr;
}
if (back)
mem_d(back);
if (!tmpl)
return;
- tmpl->description = NULL;
- tmpl->proceduretype = NULL;
- tmpl->compileflags = NULL;
- tmpl->executeflags = NULL;
- tmpl->comparematch = NULL;
- tmpl->sourcefile = NULL;
- tmpl->tempfilename = NULL;
- tmpl->rulesfile = NULL;
- tmpl->testflags = NULL;
+ tmpl->description = nullptr;
+ tmpl->proceduretype = nullptr;
+ tmpl->compileflags = nullptr;
+ tmpl->executeflags = nullptr;
+ tmpl->sourcefile = nullptr;
+ tmpl->tempfilename = nullptr;
+ tmpl->rulesfile = nullptr;
+ tmpl->testflags = nullptr;
}
static 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 *tmpl = NULL;
+ FILE *tempfile = nullptr;
+ task_template_t *tmpl = nullptr;
- util_snprintf(fullfile, sizeof(fullfile), "%s/%s", dir, file);
+ util_snprintf(fullfile, sizeof(fullfile), "%s/%s", dir, file);
tempfile = fopen(fullfile, "r");
- tmpl = (task_template_t*)mem_a(sizeof(task_template_t));
+ tmpl = (task_template_t*)mem_a(sizeof(task_template_t));
+ new (tmpl) task_template_t();
task_template_nullify(tmpl);
/*
if (!strcmp(tmpl->proceduretype, "-compile")) {
if (tmpl->executeflags)
con_err("template compile warning: %s erroneous tag `E:` when only compiling\n", file);
- if (tmpl->comparematch)
+ if (tmpl->comparematch.size())
con_err("template compile warning: %s erroneous tag `M:` when only compiling\n", file);
goto success;
} else if (!strcmp(tmpl->proceduretype, "-execute")) {
/* default to $null */
tmpl->executeflags = util_strdup("$null");
}
- if (!tmpl->comparematch) {
+ if (tmpl->comparematch.empty()) {
con_err("template compile error: %s missing `M:` tag (use `$null` for exclude)\n", file);
goto failure;
}
} else if (!strcmp(tmpl->proceduretype, "-fail")) {
if (tmpl->executeflags)
con_err("template compile warning: %s erroneous tag `E:` when only failing\n", file);
- if (tmpl->comparematch)
+ if (tmpl->comparematch.size())
con_err("template compile warning: %s erroneous tag `M:` when only failing\n", file);
} else if (!strcmp(tmpl->proceduretype, "-diagnostic")) {
if (tmpl->executeflags)
con_err("template compile warning: %s erroneous tag `E:` when only diagnostic\n", file);
- if (!tmpl->comparematch) {
+ if (tmpl->comparematch.empty()) {
con_err("template compile error: %s missing `M:` tag (use `$null` for exclude)\n", file);
goto failure;
}
} else if (!strcmp(tmpl->proceduretype, "-pp")) {
if (tmpl->executeflags)
con_err("template compile warning: %s erroneous tag `E:` when only preprocessing\n", file);
- if (!tmpl->comparematch) {
+ if (tmpl->comparematch.empty()) {
con_err("template compile error: %s missing `M:` tag (use `$null` for exclude)\n", file);
goto failure;
}
*/
if (tempfile)
fclose(tempfile);
- mem_d (tmpl);
+ mem_d(tmpl);
- return NULL;
+ return nullptr;
}
static void task_template_destroy(task_template_t *tmpl) {
if (tmpl->rulesfile) mem_d(tmpl->rulesfile);
if (tmpl->testflags) mem_d(tmpl->testflags);
- /*
- * Delete all allocated string for task tmpl then destroy the
- * main vector.
- */
- {
- size_t i = 0;
- for (; i < vec_size(tmpl->comparematch); i++)
- mem_d(tmpl->comparematch[i]);
- vec_free(tmpl->comparematch);
- }
+ for (auto &it : tmpl->comparematch)
+ mem_d(it);
/*
- * Nullify all the template members otherwise NULL comparision
+ * Nullify all the template members otherwise nullptr comparision
* checks will fail if tmpl pointer is reused.
*/
mem_d(tmpl->tempfilename);
bool compiled;
};
-static task_t *task_tasks = NULL;
+static std::vector<task_t> task_tasks;
/*
* Read a directory and searches for all template files in it
* which is later used to run all tests.
*/
static 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;
- char **directories = NULL;
- char *claim = util_strdup(curdir);
- size_t i;
-
- vec_push(directories, claim);
+ bool success = true;
+ DIR *dir;
+ struct dirent *files;
+ struct stat directory;
+ char buffer[4096];
+ size_t found = 0;
+ std::vector<char *> directories;
+ char *claim = util_strdup(curdir);
+
+ directories.push_back(claim);
dir = opendir(claim);
/*
}
if (S_ISDIR(directory.st_mode) && files->d_name[0] != '.') {
- vec_push(directories, claim);
+ directories.push_back(claim);
} else {
mem_d(claim);
- claim = NULL;
+ claim = nullptr;
}
}
closedir(dir);
* test as well and compile the task templates into data we can
* use to run the tests.
*/
- for (i = 0; i < vec_size(directories); i++) {
- dir = opendir(directories[i]);
-
+ for (auto &it : directories) {
+ dir = opendir(it);
while ((files = readdir(dir))) {
- util_snprintf(buffer, sizeof(buffer), "%s/%s", directories[i], files->d_name);
+ util_snprintf(buffer, sizeof(buffer), "%s/%s", it, files->d_name);
if (stat(buffer, &directory) == -1) {
con_err("internal error: stat failed, aborting\n");
abort();
* actually a directory, so it must be a file :)
*/
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);
+ task_template_t *tmpl = task_template_compile(files->d_name, it, pad);
char buf[4096]; /* one page should be enough */
- const char *qcflags = NULL;
+ const char *qcflags = nullptr;
task_t task;
+ memset(&task, 0, sizeof(task));
+
found ++;
if (!tmpl) {
con_err("error compiling task template: %s\n", files->d_name);
* Generate a temportary file name for the output binary
* so we don't trample over an existing one.
*/
- tmpl->tempfilename = NULL;
- util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s.dat", directories[i], files->d_name);
+ tmpl->tempfilename = nullptr;
+ util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s.dat", it, files->d_name);
/*
* Additional QCFLAGS enviroment variable may be used
if (tmpl->testflags && !strcmp(tmpl->testflags, "-no-defs")) {
util_snprintf(buf, sizeof(buf), "%s %s/%s %s %s -o %s",
task_bins[TASK_COMPILE],
- directories[i],
+ it,
tmpl->sourcefile,
qcflags,
tmpl->compileflags,
task_bins[TASK_COMPILE],
curdir,
defs,
- directories[i],
+ it,
tmpl->sourcefile,
qcflags,
tmpl->compileflags,
if (tmpl->testflags && !strcmp(tmpl->testflags, "-no-defs")) {
util_snprintf(buf, sizeof(buf), "%s %s/%s %s -o %s",
task_bins[TASK_COMPILE],
- directories[i],
+ it,
tmpl->sourcefile,
tmpl->compileflags,
tmpl->tempfilename
task_bins[TASK_COMPILE],
curdir,
defs,
- directories[i],
+ it,
tmpl->sourcefile,
tmpl->compileflags,
tmpl->tempfilename
if (tmpl->testflags && !strcmp(tmpl->testflags, "-no-defs")) {
util_snprintf(buf, sizeof(buf), "%s -E %s/%s %s -o %s",
task_bins[TASK_COMPILE],
- directories[i],
+ it,
tmpl->sourcefile,
tmpl->compileflags,
tmpl->tempfilename
task_bins[TASK_COMPILE],
curdir,
defs,
- directories[i],
+ it,
tmpl->sourcefile,
tmpl->compileflags,
tmpl->tempfilename
* Open up some file desciptors for logging the stdout/stderr
* to our own.
*/
- util_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 = fopen(buf, "w"))) {
con_err("error opening %s for stdout\n", buf);
continue;
}
- util_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 = fopen(buf, "w"))) {
con_err("error opening %s for stderr\n", buf);
continue;
}
- vec_push(task_tasks, task);
+ task_tasks.push_back(task);
}
}
closedir(dir);
- mem_d(directories[i]); /* free claimed memory */
+ mem_d(it); /* free claimed memory */
}
- vec_free(directories);
-
return success;
}
* then proceed to cleanup anything else outside the program like
* temporary files.
*/
- size_t i;
- for (i = 0; i < vec_size(task_tasks); i++) {
+ for (auto &it : task_tasks) {
/*
* 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].stdoutlog) fclose(task_tasks[i].stdoutlog);
- if (task_tasks[i].stderrlog) fclose(task_tasks[i].stderrlog);
+ if (it.stdoutlog) fclose(it.stdoutlog);
+ if (it.stderrlog) fclose(it.stderrlog);
/*
* 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)
*/
- 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);
- if (remove(task_tasks[i].stderrlogfile))
- con_err("error removing stderr log file: %s\n", task_tasks[i].stderrlogfile);
+ if (it.compiled || !strcmp(it.tmpl->proceduretype, "-fail")) {
+ if (remove(it.stdoutlogfile))
+ con_err("error removing stdout log file: %s\n", it.stdoutlogfile);
+ if (remove(it.stderrlogfile))
+ con_err("error removing stderr log file: %s\n", it.stderrlogfile);
- (void)!remove(task_tasks[i].tmpl->tempfilename);
+ (void)!remove(it.tmpl->tempfilename);
}
/* free util_strdup data for log files */
- mem_d(task_tasks[i].stdoutlogfile);
- mem_d(task_tasks[i].stderrlogfile);
+ mem_d(it.stdoutlogfile);
+ mem_d(it.stderrlogfile);
- task_template_destroy(task_tasks[i].tmpl);
+ task_template_destroy(it.tmpl);
}
- vec_free(task_tasks);
}
/*
* messages IF the procedure type is -execute, otherwise it matches
* the preprocessor output.
*/
-static bool task_trymatch(size_t i, char ***line) {
- bool success = true;
- bool process = true;
- int retval = EXIT_SUCCESS;
- FILE *execute;
- char buffer[4096];
- task_template_t *tmpl = task_tasks[i].tmpl;
+static bool task_trymatch(task_t &task, std::vector<char *> &line) {
+ bool success = true;
+ bool process = true;
+ int retval = EXIT_SUCCESS;
+ FILE *execute;
+ char buffer[4096];
+ task_template_t *tmpl = task.tmpl;
- memset (buffer,0,sizeof(buffer));
+ memset(buffer,0,sizeof(buffer));
if (!strcmp(tmpl->proceduretype, "-execute")) {
/*
* in runhandles[2] (stderr) since that is where the compiler
* puts it's errors.
*/
- if (!(execute = fopen(task_tasks[i].stderrlogfile, "r")))
+ if (!(execute = fopen(task.stderrlogfile, "r")))
return false;
process = false;
}
* and handle accordingly.
*/
{
- char *data = NULL;
+ char *data = nullptr;
size_t size = 0;
size_t compare = 0;
if (!strcmp(tmpl->proceduretype, "-pp") && !*data)
continue;
- if (vec_size(tmpl->comparematch) > compare) {
+ if (tmpl->comparematch.size() > compare) {
if (strcmp(data, tmpl->comparematch[compare++])) {
success = false;
}
success = false;
}
- /*
- * Copy to output vector for diagnostics if execution match
- * fails.
- */
- vec_push(*line, data);
+ line.push_back(data);
/* reset */
- data = NULL;
+ data = nullptr;
size = 0;
}
- if (compare != vec_size(tmpl->comparematch))
+ if (compare != tmpl->comparematch.size())
success = false;
mem_d(data);
- data = NULL;
+ data = nullptr;
}
if (process)
*/
#include <math.h>
static size_t task_schedualize(size_t *pad) {
- char space[2][64];
- bool execute = false;
- char *data = NULL;
- char **match = NULL;
- size_t size = 0;
- 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));
-
- for (; i < vec_size(task_tasks); i++) {
+ char space[2][64];
+ bool execute = false;
+ char *data = nullptr;
+ std::vector<char *> match;
+ size_t size = 0;
+ size_t i = 0;
+ size_t failed = 0;
+ int status = 0;
+
+ util_snprintf(space[0], sizeof(space[0]), "%d", (int)task_tasks.size());
+
+ for (auto &it : task_tasks) {
+ i++;
memset(space[1], 0, sizeof(space[1]));
- util_snprintf(space[1], sizeof(space[1]), "%d", (int)(i + 1));
+ util_snprintf(space[1], sizeof(space[1]), "%d", (int)(i));
- con_out("test #%u %*s", i + 1, strlen(space[0]) - strlen(space[1]), "");
+ con_out("test #%u %*s", i, strlen(space[0]) - strlen(space[1]), "");
+ //con_out("[[%*s]]",
+ // (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ // it.tmpl->rulesfile);
+ //fflush(stdout);
/*
* Generate a task from thin air if it requires execution in
*/
/* 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")) ||
- (!strcmp(task_tasks[i].tmpl->proceduretype, "-diagnostic"));
+ execute = !! (!strcmp(it.tmpl->proceduretype, "-execute")) ||
+ (!strcmp(it.tmpl->proceduretype, "-pp")) ||
+ (!strcmp(it.tmpl->proceduretype, "-diagnostic"));
/*
* We assume it compiled before we actually compiled :). On error
* we change the value
*/
- task_tasks[i].compiled = true;
+ it.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 (util_getline(&data, &size, it.runhandles[1]) != EOF) {
+ fputs(data, it.stdoutlog);
if (strstr(data, "failed to open file")) {
- task_tasks[i].compiled = false;
+ it.compiled = false;
execute = false;
}
}
- while (util_getline(&data, &size, task_tasks[i].runhandles[2]) != EOF) {
+ while (util_getline(&data, &size, it.runhandles[2]) != EOF) {
/*
* If a string contains an error we just dissalow execution
* of it in the vm.
* that refers to a variable named error, or something like
* that .. then this will blowup :P
*/
- if (strstr(data, "error") && strcmp(task_tasks[i].tmpl->proceduretype, "-diagnostic")) {
+ if (strstr(data, "error") && strcmp(it.tmpl->proceduretype, "-diagnostic")) {
execute = false;
- task_tasks[i].compiled = false;
+ it.compiled = false;
}
- fputs(data, task_tasks[i].stderrlog);
- fflush(task_tasks[i].stderrlog); /* fast flush for read */
+ fputs(data, it.stderrlog);
+ fflush(it.stderrlog); /* fast flush for read */
}
- if (!task_tasks[i].compiled && strcmp(task_tasks[i].tmpl->proceduretype, "-fail")) {
+ if (!it.compiled && strcmp(it.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("(failed to compile)") - pad[2]),
+ it.tmpl->description,
+ (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ it.tmpl->rulesfile,
+ (pad[1] + pad[2] - strlen(it.tmpl->rulesfile)) + (strlen("(failed to compile)") - pad[2]),
"(failed to compile)"
);
failed++;
continue;
}
- 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)) {
+ status = task_pclose(it.runhandles);
+ if (status != 0 && status != 1) {
+ con_out("compiler failure (returned: %i): `%s` %*s\n",
+ status,
+ it.tmpl->description,
+ (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ it.tmpl->rulesfile
+ );
+ failed++;
+ continue;
+ }
+ if ((!strcmp(it.tmpl->proceduretype, "-fail") && status == EXIT_SUCCESS)
+ || ( strcmp(it.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]),
- task_tasks[i].tmpl->rulesfile,
- (pad[1] + pad[2] - strlen(task_tasks[i].tmpl->rulesfile)) + (strlen("(compiler didn't return exit success)") - pad[2]),
+ it.tmpl->description,
+ (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ it.tmpl->rulesfile,
+ (pad[1] + pad[2] - strlen(it.tmpl->rulesfile)) + (strlen("(compiler didn't return exit success)") - pad[2]),
"(compiler didn't return exit success)"
);
failed++;
if (!execute) {
con_out("succeeded: `%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(task_type(task_tasks[i].tmpl)) - pad[2]),
- task_type(task_tasks[i].tmpl)
+ it.tmpl->description,
+ (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ it.tmpl->rulesfile,
+ (pad[1] + pad[2] - strlen(it.tmpl->rulesfile)) + (strlen(task_type(it.tmpl)) - pad[2]),
+ task_type(it.tmpl)
);
continue;
* in the virtual machine (or the preprocessor output needs to
* be matched).
*/
- if (!task_trymatch(i, &match)) {
+ if (!task_trymatch(it, match)) {
size_t d = 0;
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(
- (strcmp(task_tasks[i].tmpl->proceduretype, "-pp"))
+ it.tmpl->description,
+ (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ it.tmpl->rulesfile,
+ (pad[1] + pad[2] - strlen(it.tmpl->rulesfile)) + (strlen(
+ (strcmp(it.tmpl->proceduretype, "-pp"))
? "(invalid results from execution)"
- : (strcmp(task_tasks[i].tmpl->proceduretype, "-diagnostic"))
+ : (strcmp(it.tmpl->proceduretype, "-diagnostic"))
? "(invalid results from preprocessing)"
: "(invalid results from compiler diagnsotics)"
) - pad[2]),
- (strcmp(task_tasks[i].tmpl->proceduretype, "-pp"))
+ (strcmp(it.tmpl->proceduretype, "-pp"))
? "(invalid results from execution)"
- : (strcmp(task_tasks[i].tmpl->proceduretype, "-diagnostic"))
+ : (strcmp(it.tmpl->proceduretype, "-diagnostic"))
? "(invalid results from preprocessing)"
: "(invalid results from compiler diagnsotics)"
);
* what was actually returned from executing.
*/
con_out(" Expected From %u Matches: (got %u Matches)\n",
- vec_size(task_tasks[i].tmpl->comparematch),
- vec_size(match)
+ it.tmpl->comparematch.size(),
+ match.size()
);
- for (; d < vec_size(task_tasks[i].tmpl->comparematch); d++) {
- char *select = task_tasks[i].tmpl->comparematch[d];
+ for (; d < it.tmpl->comparematch.size(); d++) {
+ char *select = it.tmpl->comparematch[d];
size_t length = 60 - strlen(select);
-
con_out(" Expected: \"%s\"", select);
while (length --)
con_out(" ");
- con_out("| Got: \"%s\"\n", (d >= vec_size(match)) ? "<<nothing else to compare>>" : match[d]);
+ con_out("| Got: \"%s\"\n", (d >= match.size()) ? "<<nothing else to compare>>" : match[d]);
}
/*
* 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++) {
+ if (match.size() > it.tmpl->comparematch.size()) {
+ for (d = 0; d < match.size() - it.tmpl->comparematch.size(); d++) {
con_out(" Expected: Nothing | Got: \"%s\"\n",
- match[d + vec_size(task_tasks[i].tmpl->comparematch)]
+ match[d + it.tmpl->comparematch.size()]
);
}
}
-
- for (j = 0; j < vec_size(match); j++)
- mem_d(match[j]);
- vec_free(match);
+ for (auto &it : match)
+ mem_d(it);
+ match.clear();
failed++;
continue;
}
- for (j = 0; j < vec_size(match); j++)
- mem_d(match[j]);
- vec_free(match);
+ for (auto &it : match)
+ mem_d(it);
+ match.clear();
con_out("succeeded: `%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(task_type(task_tasks[i].tmpl))- pad[2]),
- task_type(task_tasks[i].tmpl)
+ it.tmpl->description,
+ (pad[0] + pad[1] - strlen(it.tmpl->description)) + (strlen(it.tmpl->rulesfile) - pad[1]),
+ it.tmpl->rulesfile,
+ (pad[1] + pad[2] - strlen(it.tmpl->rulesfile)) + (strlen(task_type(it.tmpl))- pad[2]),
+ task_type(it.tmpl)
);
}
*/
failed = task_schedualize(pad);
if (failed)
- con_out("%u out of %u tests failed\n", failed, vec_size(task_tasks));
+ con_out("%u out of %u tests failed\n", failed, task_tasks.size());
task_destroy();
return (failed) ? false : true;
int main(int argc, char **argv) {
bool succeed = false;
- char *defs = NULL;
+ char *defs = nullptr;
con_init();
projects / xonotic / gmqcc.git / blobdiff