Changeset 4e9151f for src

Timestamp:

Apr 24, 2017, 12:55:22 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

00303d50

Parents:

b3d70eba

Message:

• Fixed tests to no longer use make errors, pipeing CC errors directly instead
• Tests now use the number of cores as the number of jobs if jobserver is not defined
• Tests now support both jobserver-fds and and jobserver-auth as the file descriptor variables
• Tests now limit the number of concurrent jobs to the total number of tests
• Tests now ignore whitespaces and blank lines when comparing diffs

Location:

src/tests

Files:

• .expect/castError.txt (modified) (1 diff)
• .expect/completeTypeError.txt (modified) (1 diff)
• .expect/constant0-1DP.txt (modified) (1 diff)
• .expect/constant0-1NDDP.txt (modified) (1 diff)
• .expect/declarationErrors.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR2.txt (modified) (1 diff)
• .expect/memberCtors-ERR1.txt (modified) (1 diff)
• .expect/scopeErrors.txt (modified) (1 diff)
• .gitignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• test.py (modified) (7 diffs)

src/tests/.expect/castError.txt

@@ -39 +39 @@
 
 
-make: *** [castError] Error 1

src/tests/.expect/completeTypeError.txt

@@ -41 +41 @@
 
 
-make: *** [completeTypeError] Error 1

src/tests/.expect/constant0-1DP.txt

@@ -31 +31 @@
 constant0-1.c:50 error: duplicate object definition for x: const pointer to pointer to signed int
 constant0-1.c:50 error: duplicate object definition for 0: pointer to pointer to signed int
-make: *** [constant0-1DP] Error 1

src/tests/.expect/constant0-1NDDP.txt

@@ -15 +15 @@
 constant0-1.c:67 error: duplicate object definition for x: const pointer to signed int
 constant0-1.c:67 error: duplicate object definition for 0: const pointer to signed int
-make: *** [constant0-1NDDP] Error 1

src/tests/.expect/declarationErrors.txt

@@ -67 +67 @@
 
 
-make: *** [declarationErrors] Error 1

src/tests/.expect/dtor-early-exit-ERR1.txt

@@ -1 +1 @@
 dtor-early-exit.c:142 error: jump to label 'L1' crosses initialization of y Branch (Goto)
-
-make: *** [dtor-early-exit-ERR1] Error 1

src/tests/.expect/dtor-early-exit-ERR2.txt

@@ -1 +1 @@
 dtor-early-exit.c:142 error: jump to label 'L2' crosses initialization of y Branch (Goto)
-
-make: *** [dtor-early-exit-ERR2] Error 1

src/tests/.expect/memberCtors-ERR1.txt

@@ -1 +1 @@
 memberCtors.c:62 error: in void ?{}(B *b), field a2 used before being constructed
-make: *** [memberCtors-ERR1] Error 1

src/tests/.expect/scopeErrors.txt

@@ -7 +7 @@
   with body 
     CompoundStmt
-
-make: *** [scopeErrors] Error 1

src/tests/.gitignore

@@ -1 +1 @@
 .out/
+.err/

src/tests/Makefile.am

@@ -29 +29 @@
 # applies to both programs
 EXTRA_FLAGS =
-CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+CFLAGS = 2> .err/${@}.log -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 

src/tests/Makefile.in

@@ -125 +125 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+CFLAGS = 2> .err/${@}.log -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

src/tests/test.py

@@ -13 +13 @@
 import stat
 import sys
+import multiprocessing
 
 ################################################################################
@@ -115 +116 @@
         # 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 +139 @@
                         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 +158 @@
         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 +220 @@
 
         #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 +317 @@
 # 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 +330 @@
         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)