Changeset f1ee72e for src/tests/test.py

Timestamp:

Jun 23, 2016, 12:23:00 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4d3ca1d8

Parents:

c2931ea (diff), d56c05d0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

File:

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

src/tests/test.py

@@ -2 +2 @@
 from __future__ import print_function
 
-from os import listdir
-from os.path import isfile, join
+from os import listdir, environ
+from os.path import isfile, join, splitext
 from subprocess import Popen, PIPE, STDOUT
 
 import argparse
+import os
+import re
 import sys
 
@@ -13 +15 @@
 ################################################################################
 def listTests():
-        list = [f.rstrip('.c') for f in listdir('.')
-                if not f.startswith('.') and (
-                        not isfile(f) or f.endswith('.c')
-                )]
+        list = [splitext(f)[0] for f in listdir('./.expect')
+                if not f.startswith('.') and f.endswith('.txt')
+                ]
 
         return list
@@ -29 +30 @@
                 return proc.returncode
 
+def file_replace(fname, pat, s_after):
+    # first, see if the pattern is even in the file.
+    with open(fname) as f:
+        if not any(re.search(pat, line) for line in f):
+            return # pattern does not occur in file so we are done.
+
+    # pattern is in the file, so perform replace operation.
+    with open(fname) as f:
+        out_fname = fname + ".tmp"
+        out = open(out_fname, "w")
+        for line in f:
+            out.write(re.sub(pat, s_after, line))
+        out.close()
+        os.rename(out_fname, fname)
+
+def fix_MakeLevel(file) :
+        if environ.get('MAKELEVEL') :
+                file_replace(file, "make\[%i\]" % int(environ.get('MAKELEVEL')), 'make' )
+
+
 ################################################################################
 #               running test functions
@@ -40 +61 @@
 
         # build, skipping to next test on error
-        make_ret = sh("make -j 8 %s > %s 2>&1" % (test, out_file), dry_run)
+        make_ret = sh("make -j 8 %s 2> %s 1> /dev/null" % (test, out_file), dry_run)
 
         if make_ret == 0 :
@@ -50 +71 @@
 
         retcode = 0
+
+        fix_MakeLevel(out_file)
+
         if not generate :
-                # touch expected files so empty output are supported by default
-                sh("touch .expect/%s.txt" % test, dry_run)
-
                 # diff the output of the files
                 retcode = sh("diff .expect/%s.txt .out/%s.log" % (test, test), dry_run)
@@ -67 +88 @@
 
         if generate :
-                print( "Regenerate tests for: ", end="" )
-                print( ", ".join( tests ) )
+                print( "Regenerate tests for: " )
 
         failed = False;
         for t in tests:
-                if not generate :
-                        print("%20s  " % t, end="")
+                print("%20s  " % t, end="")
                 sys.stdout.flush()
                 test_failed = run_test_instance(t, generate, dry_run)
@@ -80 +99 @@
                 if not generate :
                         print("FAILED" if test_failed else "PASSED")
+                else :
+                        print( "Done" )
 
         sh('make clean > /dev/null 2>&1', dry_run)
 
-        if generate :
-                print( "Done" )
-
-        return 0 if failed else 1
+        return 1 if failed else 0
 
 ################################################################################
@@ -93 +111 @@
 parser = argparse.ArgumentParser(description='Script which runs cforall tests')
 parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
+parser.add_argument('--list', help='List all test available', action='store_true')
 parser.add_argument('--all', help='Run all test available', action='store_true')
-parser.add_argument('--generate-expected', help='Regenerate the .expect by running the specified tets, can be used with --all option', action='store_true')
+parser.add_argument('--regenerate-expected', help='Regenerate the .expect by running the specified tets, can be used with --all option', action='store_true')
 parser.add_argument('tests', metavar='test', type=str, nargs='*', help='a list of tests to run')
 
 options = parser.parse_args()
 
-if len(options.tests) > 0 and options.all :
+if (len(options.tests) > 0  and     options.all and not options.list) \
+or (len(options.tests) == 0 and not options.all and not options.list) :
         print('ERROR: must have option \'--all\' or non-empty test list', file=sys.stderr)
         parser.print_help()
         sys.exit(1)
 
-tests = listTests() if options.all else options.tests
+allTests = listTests()
 
-sys.exit( run_tests(tests, options.generate_expected, options.dry_run) )
+if options.all or options.list :
+        tests = allTests
+
+else :
+        tests = []
+        for test in options.tests:
+                if test in allTests :
+                        tests.append(test)
+                else :
+                        print('ERROR: No expected file for test %s, ignoring it' % test, file=sys.stderr)
+
+        if len(tests) == 0 :
+                print('ERROR: No valid test to run', file=sys.stderr)
+                sys.exit(1)
+
+if options.list :
+        print("\n".join(tests))
+
+else :
+        sys.exit( run_tests(tests, options.regenerate_expected, options.dry_run) )