Merge branch 'cooking'

Conflicts:
	test.c

diff --combined test.c
index 370861ed9f1becd34df5a5a495a72024d3d8083e,bf429853b263c39ca2732807098ac184f37f2686..6d8e9ad7192bf08ff2e583c5b3be9c343d57e37b
--- 1/test.c
--- 2/test.c
+++ b/test.c
@@@ -85,7 -85,7 +85,7 @@@ static fs_file_t **task_popen(const cha
              while (*line != '\0' && *line != ' ' &&
                     *line != '\t' && *line != '\n') line++;
          }
 -        vec_push(argv, NULL);
 +        vec_push(argv, (char *)0);
      }
  
  
@@@ -806,19 -806,21 +806,21 @@@ static bool task_propagate(const char *
                  } 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
                          );
                      }
@@@ -1100,6 -1102,7 +1102,7 @@@ static size_t task_schedualize(size_t *
      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));
  
@@@ -1167,7 -1170,9 +1170,9 @@@
              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]),