Changeset a5121bf for tests

Timestamp:

Aug 7, 2018, 3:23:34 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

575a6e5

Parents:

524ed86

Message:

Tests can now be run from installed binaries or tree binaries

Location:

tests

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (3 diffs)
• pybin/settings.py (modified) (3 diffs)
• pybin/tools.py (modified) (1 diff)
• test.py (modified) (1 diff)

tests/Makefile.am

@@ -31 +31 @@
         -Wno-unused-function \
         -quiet @CFA_FLAGS@ \
-        -DIN_DIR="${srcdir}/.in/" \
-        @BUILD_IN_TREE_FLAGS@
+        -DIN_DIR="${srcdir}/.in/"
 
-AM_CFLAGS += ${DEBUG_FLAGS}
+AM_CFLAGS += ${DEBUG_FLAGS} ${INSTALL_FLAGS}
 
 CC = @CFACC@
@@ -48 +47 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -66 +65 @@
 
 concurrency :
-        @+${TEST_PY} --debug=${debug} -Iconcurrent
+        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
 
 #----------------------------------------------------------------------------------------------------------------

tests/Makefile.in

@@ -303 +303 @@
 # applies to both programs
 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
-        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
-        @BUILD_IN_TREE_FLAGS@ ${DEBUG_FLAGS}
+        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" ${DEBUG_FLAGS} \
+        ${INSTALL_FLAGS}
 fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
@@ -613 +613 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
+        @+${TEST_PY} --debug=${debug}  --install=${installed} ${concurrent} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --all --debug=${debug} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --all --debug=${debug}  --install=${installed} ${concurrent}               # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -631 +631 @@
 
 concurrency :
-        @+${TEST_PY} --debug=${debug} -Iconcurrent
+        @+${TEST_PY} --debug=${debug}  --install=${installed} -Iconcurrent
 
 #----------------------------------------------------------------------------------------------------------------

tests/pybin/settings.py

@@ -67 +67 @@
                 self.flags  = """DEBUG_FLAGS="%s" """ % ("-debug" if value else "-nodebug")
 
+class Install:
+        def __init__(self, value):
+                self.string = "installed" if value else "in-tree"
+                self.flags  = """INSTALL_FLAGS="%s" """ % ("" if value else "-in-tree")
+
 def init( options ):
         global arch
@@ -73 +78 @@
         global make
         global debug
-        global debugFlag
+        global install
 
         dry_run    = options.dry_run
@@ -79 +84 @@
         make       = 'make'
         debug        = Debug(options.debug)
+        install    = Install(options.install)
         arch       = Architecture(options.arch)
 

tests/pybin/tools.py

@@ -102 +102 @@
                 test_param,
                 settings.debug.flags,
+                settings.install.flags,
                 flags,
                 target,

tests/test.py

@@ -86 +86 @@
         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='yes')
+        parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=yes_no, default='no')
         parser.add_argument('--arch', help='Test for specific architecture', type=str, default='')
         parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')