Changeset 075d862

Timestamp:

Apr 27, 2017, 12:49:56 PM (8 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:

e464759

Parents:

b98c913 (diff), 592b9fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/tests

Files:

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

src/tests/Makefile.am

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

src/tests/Makefile.in

@@ -125 +125 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
+CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -231 +231 @@
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
 @BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int sched-ext preempt
+TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 
 # applies to both programs

src/tests/test.py

@@ -136 +136 @@
 
                 # build, skipping to next test on error
-                make_ret, _ = sh("""%s 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="-quiet %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