Changes in src/tests/test.py [871b664:23c2b8d3]

File:

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

src/tests/test.py

@@ -32 +32 @@
         return re.search("ELF\s([0-9]+)-bit", out).group(1)
 
-def listTestsFolder(folder) :
-        path = ('./.expect/%s/' % folder) if folder else './.expect/'
-        subpath = "%s/" % folder if folder else ""
+# reads the directory ./.expect and indentifies the tests
+def listTests():
+        machineType = getMachineType()
 
         # tests directly in the .expect folder will always be processed
-        return map(lambda fname: Test(fname, subpath + fname),
-                [splitext(f)[0] for f in listdir( path )
+        generic_list = map(lambda fname: Test(fname, fname),
+                [splitext(f)[0] for f in listdir('./.expect')
                 if not f.startswith('.') and f.endswith('.txt')
                 ])
 
-# reads the directory ./.expect and indentifies the tests
-def listTests( concurrent ):
-        machineType = getMachineType()
-
-        # tests directly in the .expect folder will always be processed
-        generic_list = listTestsFolder( "" )
-
         # tests in the machineType folder will be ran only for the corresponding compiler
-        typed_list = listTestsFolder( machineType )
-
-        # tests in the concurrent folder will be ran only if concurrency is enabled
-        concurrent_list = listTestsFolder( "concurrent" ) if concurrent else []
+        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')
+                ])
 
         # append both lists to get
-        return generic_list + typed_list + concurrent_list;
+        return generic_list + typed_list
 
 # helper functions to run terminal commands
@@ -201 +194 @@
                 sys.stderr.flush()
                 return test_failed
-
+        
         except KeyboardInterrupt:
                 test_failed = True
@@ -250 +243 @@
 parser = argparse.ArgumentParser(description='Script which runs cforall tests')
 parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
-parser.add_argument('--concurrent', help='Run concurrent tests', type=yes_no, default='no')
 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')
@@ -269 +261 @@
 
 # fetch the liest of all valid tests
-allTests = listTests( options.concurrent )
+allTests = listTests()
 
 # if user wants all tests than no other treatement of the test list is required