Changeset f803a75

Timestamp:

May 10, 2017, 3:52:27 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

ad1770be

Parents:

e325958

Message:

moved quiet flags to makefile

Location:

src/tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• test.py (modified) (4 diffs)

src/tests/Makefile.am

@@ -30 +30 @@
 # applies to both programs
 EXTRA_FLAGS =
-BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}

src/tests/Makefile.in

@@ -234 +234 @@
 # applies to both programs
 EXTRA_FLAGS = 
-BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 fstream_test_SOURCES = fstream_test.c

src/tests/test.py

@@ -28 +28 @@
         sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
         ret, out = sh("make .dummy -s", print2stdout=True)
-        
+
         if ret != 0:
                 print("Failed to identify architecture:")
@@ -161 +161 @@
 
         # build, skipping to next test on error
-        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="-quiet %s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
 
         # if the make command succeds continue otherwise skip to diff
@@ -192 +192 @@
                 # fetch return code and error from the diff command
                 retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
-        
+
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
@@ -269 +269 @@
 if __name__ == "__main__":
         #always run from same folder
-        chdir() 
-        
+        chdir()
+
         # parse the command line arguments
         options = getOptions()