Changes in src/tests/test.py [cb2e8ce:38736854]

File:

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

src/tests/test.py

@@ -23 +23 @@
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
-        with open('Makefile') as file:
-                makefile = file.read()
-                m = re.search("CFA_FLAGS\s*=\s*-m(.*)", makefile)
-                return m.group(1) if m else '64'
+        sh('echo "int main() { return 0; }" > .dummy.c')
+        sh("make .dummy", print2stdout=False)
+        _, out = sh("file .dummy", print2stdout=False)
+        sh("rm -f .dummy.c > /dev/null 2>&1")
+        sh("rm -f .dummy > /dev/null 2>&1")
+        return re.search("ELF\s([0-9]+)-bit", out).group(1)
 
 # reads the directory ./.expect and indentifies the tests
@@ -97 +99 @@
                 return False
 
-# find the test data for a given test name
-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
@@ -139 +136 @@
                 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
+                        error = "\t\tNo make target for test %s!" % test.name
                         sh("rm %s" % out_file, False)
 
@@ -250 +247 @@
         # already existing tests and create new info for the new tests
         if options.regenerate_expected :
-                tests = map(filterTests, options.tests)
+                for testname in options.tests :
+                        if testname.endswith(".c") or testname.endswith(".cc") or testname.endswith(".cpp") :
+                                print('ERROR: "%s", tests are not allowed to end with a C/C++/CFA extension, ignoring it' % testname, file=sys.stderr)
+                        else :
+                                found = [test for test in allTests if test.name == testname]
+                                tests.append( found[0] if len(found) == 1 else Test(testname, testname) )
 
         else :