Changeset be65cca

Timestamp:

Mar 1, 2017, 3:13:04 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

a62cbb3

Parents:

60401b76

Message:

Concurrent tests no longer run when threading is disable

Location:

src/tests

Files:

• .expect/concurrent/coroutine.txt (moved) (moved from src/tests/.expect/coroutine.txt)
• .expect/concurrent/monitor.txt (moved) (moved from src/tests/.expect/monitor.txt)
• .expect/concurrent/multi-monitor.txt (moved) (moved from src/tests/.expect/multi-monitor.txt)
• .expect/concurrent/thread.txt (moved) (moved from src/tests/.expect/thread.txt)
• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (4 diffs)
• test.py (modified) (4 diffs)

src/tests/Makefile.am

@@ -17 +17 @@
 debug=yes
 
+quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once
+
+if BUILD_CONCURRENCY
+concurrent=yes
+quick_test+= coroutine thread monitor
+else
+concurrent=no
+endif
+
+
 # applies to both programs
 EXTRA_FLAGS =
@@ -30 +40 @@
 
 all-local :
-        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine thread
+        @+python test.py ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+python test.py --all --debug=${debug} --concurrent=${concurrent}              # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -39 +49 @@
 
 list :
-        @+python test.py --list
+        @+python test.py --list --concurrent=${concurrent}
 
 constant0-1DP : constant0-1.c

src/tests/Makefile.in

@@ -37 +37 @@
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
         avl_test$(EXEEXT) constant0-1DP$(EXEEXT) \
@@ -222 +223 @@
 top_srcdir = @top_srcdir@
 debug = yes
+quick_test = vector_test avl_test operators numericConstants \
+        expression enum array typeof cast dtor-early-exit init_once \
+        $(am__append_1)
+@BUILD_CONCURRENCY_FALSE@concurrent = no
+@BUILD_CONCURRENCY_TRUE@concurrent = yes
 
 # applies to both programs
@@ -651 +657 @@
 
 all-local :
-        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine thread
+        @+python test.py ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+python test.py --all --debug=${debug} --concurrent=${concurrent}              # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -660 +666 @@
 
 list :
-        @+python test.py --list
+        @+python test.py --list --concurrent=${concurrent}
 
 constant0-1DP : constant0-1.c

src/tests/test.py

@@ -32 +32 @@
         return re.search("ELF\s([0-9]+)-bit", out).group(1)
 
-# reads the directory ./.expect and indentifies the tests
-def listTests():
-        machineType = getMachineType()
+def listTestsFolder(folder) :
+        path = ('./.expect/%s' % folder) if folder else './expect'
 
         # tests directly in the .expect folder will always be processed
-        generic_list = map(lambda fname: Test(fname, fname),
-                [splitext(f)[0] for f in listdir('./.expect')
+        return map(lambda fname: Test(fname, '%s/%s' % (path, fname)),
+                [splitext(f)[0] for f in listdir( path )
                 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 = 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')
-                ])
+        typed_list = listTestsFolder( machineType )
+
+        # tests in the concurrent folder will be ran only if concurrency is enabled
+        concurrent_list = listTestsFolder( "concurrent" ) if concurrent else []
 
         # append both lists to get
-        return generic_list + typed_list
+        return generic_list + typed_list + concurrent_list;
 
 # helper functions to run terminal commands
@@ -194 +200 @@
                 sys.stderr.flush()
                 return test_failed
-        
+
         except KeyboardInterrupt:
                 test_failed = True
@@ -243 +249 @@
 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')
@@ -260 +267 @@
         sys.exit(1)
 
+print( options.concurrent )
+
 # fetch the liest of all valid tests
-allTests = listTests()
+allTests = listTests( options.concurrent )
 
 # if user wants all tests than no other treatement of the test list is required