Changes in src/tests/test.py [7895d46:47f9422]

File:

• src/tests/test.py (modified) (8 diffs)

src/tests/test.py ¶

@@ -13 +13 @@
 import stat
 import sys
+import multiprocessing
 
 ################################################################################
@@ -26 +27 @@
 def getMachineType():
         sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
-        sh("make .dummy", print2stdout=False)
+        ret, out = sh("make .dummy", print2stdout=False)
+        if ret != 0:
+                print("Failed to identify architecture:")
+                print(out)
+                print("Stopping")
+                sys.exit(1)
         _, out = sh("file .dummy", print2stdout=False)
         sh("rm -f .dummy.c > /dev/null 2>&1")
@@ -115 +121 @@
         # find the output file based on the test name and options flag
         out_file = (".out/%s.log" % test.name) if not generate else (".expect/%s.txt" % test.path)
+        err_file = ".err/%s.log" % test.name
 
         # remove any outputs from the previous tests to prevent side effects
@@ -137 +144 @@
                         sh("cat %s > %s" % (test.name, out_file), dry_run)
 
+        else :
+                # command failed save the log to less temporary file
+                sh("mv %s %s" % (err_file, out_file), dry_run)
+
         retcode = 0
         error = None
 
-        # fix output to prevent make depth to cause issues
-        fix_MakeLevel(out_file)
+        # # fix output to prevent make depth to cause issues
+        # fix_MakeLevel(out_file)
 
         if generate :
@@ -152 +163 @@
         else :
                 # diff the output of the files
-                diff_cmd = ("diff --old-group-format='\t\tmissing lines :\n"
+                diff_cmd = ("diff --ignore-all-space "
+                                        "--ignore-blank-lines "
+                                        "--old-group-format='\t\tmissing lines :\n"
                                         "%%<' \\\n"
                                         "--new-group-format='\t\tnew lines :\n"
@@ -212 +225 @@
 
         #make sure the required folder are present
-        sh('mkdir -p .out .expect', dry_run)
+        sh('mkdir -p .out .expect .err', dry_run)
 
         if generate :
@@ -309 +322 @@
 # check if the user already passed in a number of jobs for multi-threading
 make_flags = environ.get('MAKEFLAGS')
-make_jobs_fds = re.search("--jobserver-fds=\s*([0-9]+),([0-9]+)", make_flags) if make_flags else None
+make_jobs_fds = re.search("--jobserver-(auth|fds)=\s*([0-9]+),([0-9]+)", make_flags) if make_flags else None
 if make_jobs_fds :
-        tokens = os.read(int(make_jobs_fds.group(1)), 1024)
+        tokens = os.read(int(make_jobs_fds.group(2)), 1024)
         options.jobs = len(tokens)
-        os.write(int(make_jobs_fds.group(2)), tokens)
+        os.write(int(make_jobs_fds.group(3)), tokens)
+else :
+        options.jobs = multiprocessing.cpu_count()
 
 # make sure we have a valid number of jobs that corresponds to user input
@@ -320 +335 @@
         sys.exit(1)
 
+options.jobs = min( options.jobs, len(tests) )
+
 print('Running (%s) on %i cores' % ("debug" if options.debug else "no debug", options.jobs))
 make_cmd = "make" if make_flags else ("make -j%i" % options.jobs)