Changeset f1231f2

Timestamp:

Jul 14, 2016, 3:25:43 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

4e95b5c

Parents:

9c791dd

Message:

added support for tests that differ between 32bit and 64bit versions

Location:

src/tests

Files:

• .expect/32/gccExtension.txt (moved) (moved from src/tests/.expect/gccExtensions.txt)
• .expect/32/math.txt (moved) (moved from src/tests/.expect/math.txt)
• .expect/64/gccExtensions.txt (added)
• .expect/64/math.txt (added)
• test.py (modified) (8 diffs)

src/tests/test.py

@@ -15 +15 @@
 #               help functions
 ################################################################################
+
+class Test:
+    def __init__(self, name, path):
+        self.name, self.path = name, path
+
+def getMachineType():
+        with open('Makefile') as file:
+                makefile = file.read()
+                m = re.search("CFA_FLAGS\s*=\s*-m(.*)", makefile)
+                return m.group(1)
+
 def listTests():
-        list = [splitext(f)[0] for f in listdir('./.expect')
+        machineType = getMachineType()
+
+        generic_list = map(lambda fname: Test(fname, fname),
+                [splitext(f)[0] for f in listdir('./.expect')
                 if not f.startswith('.') and f.endswith('.txt')
-                ]
-
-        return list
+                ])
+
+        typed_list = map(lambda fname: Test( fname, "%s/%s" % (machineType, fname) ),
+                [splitext(f)[0] for f in listdir("./.expect/%s" % machineType)
+                if not f.startswith('.') and f.endswith('.txt')
+                ])
+
+        return generic_list + typed_list
 
 def sh(cmd, dry_run = False, print2stdout = True):
@@ -71 +90 @@
                 return False
 
+def filterTests(testname) :
+        found = [test for test in allTests if test.name == testname]
+        return (found[0] if len(found) == 1 else Test(testname, testname) )
+
 ################################################################################
 #               running test functions
@@ -76 +99 @@
 def run_test_instance(test, generate, dry_run):
 
-        out_file = (".out/%s.log" % test) if not generate else (".expect/%s.txt" % test)
+        out_file = (".out/%s.log" % test.name) if not generate else (".expect/%s.txt" % test.path)
 
         sh("rm -f %s" % out_file, dry_run)
-        sh("rm -f %s > /dev/null 2>&1" % test, dry_run)
+        sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
 
         # build, skipping to next test on error
-        make_ret, _ = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
+        make_ret, _ = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test.name, out_file), dry_run)
 
         if make_ret == 0 :
                 # fetch optional input
-                stdinput = "< .in/%s.txt" % test if isfile(".in/%s.txt" % test) else ""
-
-                if fileIsExecutable(test) :
+                stdinput = "< .in/%s.txt" % test if isfile(".in/%s.txt" % test.path) else ""
+
+                if fileIsExecutable(test.name) :
                         # run test
-                        sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
+                        sh("./%s %s > %s 2>&1" % (test.name, stdinput, out_file), dry_run)
                 else :
                         # simply cat the result into the output
-                        sh("cat %s > %s" % (test, out_file), dry_run)
+                        sh("cat %s > %s" % (test.name, out_file), dry_run)
 
         retcode = 0
@@ -101 +124 @@
 
         if generate :
-                if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test) :
+                if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.name) :
                         retcode = 1;
                         error = "\t\tNo make target for test %s!" % test
@@ -122 +145 @@
                                         ".expect/%s.txt .out/%s.log")
 
-                retcode, error = sh(diff_cmd % (test, test), dry_run, False)
+                retcode, error = sh(diff_cmd % (test.path, test.name), dry_run, False)
 
         # clean the executable
-        sh("rm -f %s > /dev/null 2>&1" % test, dry_run)
+        sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
 
         return retcode, error
@@ -138 +161 @@
         failed = False;
         for t in tests:
-                print("%20s  " % t, end="")
+                print("%20s  " % t.name, end="")
                 sys.stdout.flush()
                 test_failed, error = run_test_instance(t, generate, dry_run)
@@ -183 +206 @@
 else :
         tests = []
-        for test in options.tests:
-                if test in allTests or options.regenerate_expected :
-                        tests.append(test)
-                else :
-                        print('ERROR: No expected file for test %s, ignoring it' % test, file=sys.stderr)
+
+        if options.regenerate_expected :
+                tests = map(filterTests, options.tests)
+
+        else :
+                for testname in options.tests:
+                        test = [t for t in allTests if t.name == testname]
+
+                        if len(test) != 0 :
+                                tests.append( test[0] )
+                        else :
+                                print('ERROR: No expected file for test %s, ignoring it' % testname, file=sys.stderr)
 
         if len(tests) == 0 :
@@ -193 +223 @@
                 sys.exit(1)
 
-tests.sort()
+tests.sort(key=lambda t: t.name)
+
 make_flags = environ.get('MAKEFLAGS')
 make_cmd = "make" if make_flags and "-j" in make_flags else "make -j8"
 
 if options.list :
-        print("\n".join(tests))
+        print("\n".join(map(lambda t: "%s (%s)" % (t.name, t.path), tests)))
 
 else :