Changeset 871b664

Timestamp:

Mar 1, 2017, 3:38:33 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:

088a5cd, bf8da66

Parents:

a62cbb3

Message:

Fixed path issues in tests

Files:

• configure (modified) (1 diff)
• src/tests/Makefile.am (modified) (1 diff)
• src/tests/Makefile.in (modified) (1 diff)
• src/tests/test.py (modified) (2 diffs)

configure

@@ -3224 +3224 @@
 
 
-echo $build_threading
-
 if test "x$prefix" = "xNONE"; then
         cfa_prefix=${ac_default_prefix}

src/tests/Makefile.am

@@ -40 +40 @@
 
 all-local :
-        @+python test.py ${quick_test}
+        @+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
 
 all-tests :

src/tests/Makefile.in

@@ -657 +657 @@
 
 all-local :
-        @+python test.py ${quick_test}
+        @+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
 
 all-tests :

src/tests/test.py

@@ -33 +33 @@
 
 def listTestsFolder(folder) :
-        path = ('./.expect/%s' % folder) if folder else './expect'
+        path = ('./.expect/%s/' % folder) if folder else './.expect/'
+        subpath = "%s/" % folder if folder else ""
 
         # tests directly in the .expect folder will always be processed
-        return map(lambda fname: Test(fname, '%s/%s' % (path, fname)),
+        return map(lambda fname: Test(fname, subpath + fname),
                 [splitext(f)[0] for f in listdir( path )
                 if not f.startswith('.') and f.endswith('.txt')
@@ -46 +47 @@
 
         # tests directly in the .expect folder will always be processed
-        generic_list = listTestsFolder( "." )
+        generic_list = listTestsFolder( "" )
 
         # tests in the machineType folder will be ran only for the corresponding compiler