]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Fix testsuite
authorDale Weiler <killfieldengine@gmail.com>
Sun, 2 Dec 2012 10:57:04 +0000 (10:57 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 2 Dec 2012 10:57:04 +0000 (10:57 +0000)
test.c

diff --git a/test.c b/test.c
index 34b3744952b5320ff8e79ccdb7407dba78a0c996..866bbf75d10fcc787bf69bb433f37b23e0c42830 100644 (file)
--- a/test.c
+++ b/test.c
@@ -910,8 +910,10 @@ void task_schedualize() {
         while (util_getline(&data, &size, task_tasks[i].runhandles[1]) != EOF) {
             fputs(data, task_tasks[i].stdoutlog);
 
-            if (strstr(data, "failed to open file"))
-                execute = false;
+            if (strstr(data, "failed to open file")) {
+                task_tasks[i].compiled = false;
+                execute                = false;
+            }
 
             fflush(task_tasks[i].stdoutlog);
         }
@@ -933,17 +935,25 @@ void task_schedualize() {
             fflush(task_tasks[i].stdoutlog);
         }
 
+        if (!execute) {
+            con_err("test failure: `%s` [%s] (failed to compile) see %s.stdout and %s.stderr\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
+            );
+            continue;
+        }
         /*
          * If we made it here that concludes the task is to be executed
          * in the virtual machine.
          */
-        if (!execute || !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)) {
+            con_err("test failure: `%s` [%s] (invalid results from execution)\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->failuremessage : "unknown"
             );
             continue;
         }