Changeset b5f9829


Ignore:
Timestamp:
Jul 7, 2017, 11:54:49 AM (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-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
f32e53e
Parents:
29038ef
Message:

Tests should now properly handle cases where either debug or release libcfa is absent

Location:
src/tests
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/tests/Makefile.am

    r29038ef rb5f9829  
    2929
    3030# applies to both programs
    31 EXTRA_FLAGS =
    32 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
     31DEBUG_FLAGS =
     32BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@
     33if !BUILD_DEBUG
     34BUILD_FLAGS += -nodebug
     35else
     36if !BUILD_RELEASE
     37BUILD_FLAGS += -debug
     38else
     39BUILD_FLAGS += ${BUILD_FLAGS}
     40endif
     41endif
     42
    3343TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
    3444AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
  • src/tests/Makefile.in

    r29038ef rb5f9829  
    9292host_triplet = @host@
    9393@BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
     94@BUILD_DEBUG_FALSE@am__append_2 = -nodebug
     95@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_3 = -debug
     96@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_4 = ${BUILD_FLAGS}
    9497EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
    9598        avl_test$(EXEEXT)
     
    320323
    321324# applies to both programs
    322 EXTRA_FLAGS =
    323 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
     325DEBUG_FLAGS =
     326BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ \
     327        $(am__append_2) $(am__append_3) $(am__append_4)
    324328TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
    325329AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
  • src/tests/test.py

    r29038ef rb5f9829  
    166166
    167167        # build, skipping to next test on error
    168         make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
     168        make_ret, _ = sh("""%s test=yes DEBUG_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
    169169
    170170        retcode = 0
     
    202202                        error = myfile.read()
    203203
    204                
     204
    205205        # clean the executable
    206206        sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
Note: See TracChangeset for help on using the changeset viewer.