Changeset b1848a0

Timestamp:

Aug 15, 2016, 4:13:49 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7880579, 7b1bfc5

Parents:

e82aa9df (diff), 6603c1d (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' of plg2:software/cfa/cfa-cc

File:

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

src/tests/test.py

@@ -99 +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
@@ -141 +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)
 
@@ -252 +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 :