Merge lp:~didrocks/nux/unity_support_test_caching into lp:nux

[Didier Roche-Tolomelli]

add a new unity_support_test cache file to speed up consecutive run and an option to bypass it (LP: #842656)

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'tools/unity_support_test.c'
--- tools/unity_support_test.c	2011-06-13 08:17:36 +0000
+++ tools/unity_support_test.c	2011-09-06 13:13:15 +0000
@@ -484,17 +484,14 @@
   Display      *display = NULL;
   GLXContext   context = NULL;
   TestResults  results;
+  char         resultfilename[30];
+  FILE         *resultfile;
+  int          forcecheck = 0;
 
   results.indirect = 0;
   results.compiz = 0;
   results.flags = 0;
   results.error = NULL;
-  results.flags = 0;
-
-  if (getenv ("UNITY_FORCE_START")) {
-    fprintf (stdout, "Warning: UNITY_FORCE_START enabled, no check for unity or compiz support.\n");
-    return 0;
-  }
 
   // Basic command-line parsing.
   for (int i = 1; i < argc; i++) {
@@ -512,6 +509,9 @@
     } else if ((strncmp (argv[i], "-c", 2) == 0) ||
                (strncmp (argv[i], "--compiz", 8) == 0)) {
       results.compiz = 1;
+    } else if ((strncmp (argv[i], "-f", 2) == 0) ||
+               (strncmp (argv[i], "--force-check", 13) == 0)) {
+      forcecheck = 1;
     } else if ((strncmp (argv[i], "-h", 2) == 0) ||
                (strncmp (argv[i], "--help", 6) == 0)) {
       print_help ();
@@ -523,6 +523,19 @@
     }
   }
 
+  // can skip some tests if not forced
+  if (!forcecheck) {
+      resultfile = fopen("/tmp/unity_support_test.0", "r");
+      if (resultfile) {
+          fclose(resultfile);
+          return 0;
+      }
+      if (getenv ("UNITY_FORCE_START")) {
+          fprintf (stdout, "Warning: UNITY_FORCE_START enabled, no check for unity or compiz support.\n");
+          return 0;
+      }
+  }
+
   // Open a X11 connection and get the root window.
   display = XOpenDisplay (display_name);
   if (display == NULL) {
@@ -587,5 +600,10 @@
   if (results.error != NULL)
     free (results.error);
 
+  // drop result file
+  sprintf(resultfilename, "/tmp/unity_support_test.%i", results.result);
+  resultfile = fopen(resultfilename, "w");
+  fclose(resultfile);
+
   return results.result;
 }