Changeset 075d862


Ignore:
Timestamp:
Apr 27, 2017, 12:49:56 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-env, no_list, persistent-indexer, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/tests/Makefile.am

    rb98c913 r075d862  
    2828endif
    2929
    30 
    3130# applies to both programs
    3231EXTRA_FLAGS =
    3332BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
    34 CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
     33TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
     34CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
    3535CC = @CFA_BINDIR@/@CFA_NAME@
    3636
  • src/tests/Makefile.in

    rb98c913 r075d862  
    125125CFA_NAME = @CFA_NAME@
    126126CFA_PREFIX = @CFA_PREFIX@
    127 CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
     127CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
    128128CPP = @CPP@
    129129CPPFLAGS = @CPPFLAGS@
     
    231231@BUILD_CONCURRENCY_FALSE@concurrent_test =
    232232@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int sched-ext preempt
     233TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
    233234
    234235# applies to both programs
  • src/tests/test.py

    rb98c913 r075d862  
    136136
    137137                # build, skipping to next test on error
    138                 make_ret, _ = sh("""%s EXTRA_FLAGS="-quiet %s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
     138                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)
    139139
    140140                # if the make command succeds continue otherwise skip to diff
Note: See TracChangeset for help on using the changeset viewer.