Added style + indent rule, fixed some indenting as well

[xonotic/gmqcc.git] / test.c

diff --git a/test.c b/test.c
index 357f3d397bf150322c337332548862ccec523bbc..64c9928e7fc2c82eb8a01dc9d2bdabb0fd1bb7c1 100644 (file)
--- a/test.c
+++ b/test.c
@@ -27,8 +27,6 @@
 
 #include "gmqcc.h"
 
-opts_cmd_t opts;
-
 static const char *task_bins[] = {
     "./gmqcc",
     "./qcvm"
@@ -164,8 +162,13 @@ static int task_pclose(FILE **handles) {
         char    *cmd  = NULL;
         popen_t *open = (popen_t*)mem_a(sizeof(popen_t));
 
+#ifndef _MSC_VER
         tmpnam(open->name_err);
         tmpnam(open->name_out);
+#else
+        tmpnam_s(open->name_err, L_tmpnam);
+        tmpnam_s(open->name_out, L_tmpnam);
+#endif
 
         (void)mode; /* excluded */
 
@@ -190,6 +193,8 @@ static int task_pclose(FILE **handles) {
 
         mem_d(open);
     }
+#   define popen _popen
+#   define pclose _pclose
 #endif /*! _WIN32 */
 
 #define TASK_COMPILE    0
@@ -679,7 +684,7 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
     char           **directories = NULL;
     char            *claim = util_strdup(curdir);
     size_t           i;
-    
+
     vec_push(directories, claim);
     dir = fs_dir_open(claim);
 
@@ -689,9 +694,12 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
      */
     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 {
@@ -708,7 +716,7 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
      */
     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) {
@@ -863,7 +871,7 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
                 vec_push(task_tasks, task);
             }
         }
-        
+
         fs_dir_close(dir);
         mem_d(directories[i]); /* free claimed memory */
     }
@@ -959,7 +967,7 @@ static bool task_trymatch(size_t i, char ***line) {
     FILE            *execute;
     char             buffer[4096];
     task_template_t *tmpl = task_tasks[i].tmpl;
-    
+
     memset  (buffer,0,sizeof(buffer));
 
     if (!strcmp(tmpl->proceduretype, "-execute")) {
@@ -1005,7 +1013,7 @@ static bool task_trymatch(size_t i, char ***line) {
          */
         if (!(execute = fs_file_open(task_tasks[i].stderrlogfile, "r")))
             return false;
-        
+
         process = false;
     }
 
@@ -1017,7 +1025,7 @@ static bool task_trymatch(size_t i, char ***line) {
         char  *data    = NULL;
         size_t size    = 0;
         size_t compare = 0;
-        
+
         while (fs_file_getline(&data, &size, execute) != EOF) {
             if (!strcmp(data, "No main function found\n")) {
                 con_err("test failure: `%s` (No main function found) [%s]\n",
@@ -1037,7 +1045,7 @@ static bool task_trymatch(size_t i, char ***line) {
              */
             if  (strrchr(data, '\n'))
                 *strrchr(data, '\n') = '\0';
-                
+
             /*
              * We remove the file/directory and stuff from the error
              * match messages when testing diagnostics.
@@ -1108,7 +1116,7 @@ static const char *task_type(task_template_t *tmpl) {
  * from thin air and executed INLINE.
  */
 #include <math.h>
-static void task_schedualize(size_t *pad) {
+static size_t task_schedualize(size_t *pad) {
     char   space[2][64];
     bool   execute  = false;
     char  *data     = NULL;
@@ -1116,6 +1124,7 @@ static void task_schedualize(size_t *pad) {
     size_t size     = 0;
     size_t i        = 0;
     size_t j        = 0;
+    size_t failed   = 0;
 
     util_snprintf(space[0], sizeof(space[0]), "%d", (int)vec_size(task_tasks));
 
@@ -1130,7 +1139,7 @@ static void task_schedualize(size_t *pad) {
          * 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"))      ||
@@ -1180,6 +1189,7 @@ static void task_schedualize(size_t *pad) {
                 (pad[1] + pad[2] - strlen(task_tasks[i].tmpl->rulesfile)) + (strlen("(failed to compile)") - pad[2]),
                 "(failed to compile)"
             );
+            failed++;
             continue;
         }
 
@@ -1257,9 +1267,10 @@ static void task_schedualize(size_t *pad) {
             for (j = 0; j < vec_size(match); j++)
                 mem_d(match[j]);
             vec_free(match);
+            failed++;
             continue;
         }
-        
+
         for (j = 0; j < vec_size(match); j++)
             mem_d(match[j]);
         vec_free(match);
@@ -1274,6 +1285,7 @@ static void task_schedualize(size_t *pad) {
         );
     }
     mem_d(data);
+    return failed;
 }
 
 /*
@@ -1291,6 +1303,7 @@ static void task_schedualize(size_t *pad) {
  * It expects con_init() was called before hand.
  */
 static GMQCC_WARN bool test_perform(const char *curdir, const char *defs) {
+    size_t             failed       = false;
     static const char *default_defs = "defs.qh";
 
     size_t pad[] = {
@@ -1320,10 +1333,12 @@ static GMQCC_WARN bool test_perform(const char *curdir, const char *defs) {
      * it's designed to prevent lock contention, and possible syncronization
      * issues.
      */
-    task_schedualize(pad);
+    failed = task_schedualize(pad);
+    if (failed)
+        con_out("%u out of %u tests failed\n", failed, vec_size(task_tasks));
     task_destroy();
 
-    return true;
+    return (failed) ? false : true;
 }
 
 /*