diff options
| author | dhuth <derickhuth@gmail.com> | 2014-11-01 14:40:33 -0600 |
|---|---|---|
| committer | dhuth <derickhuth@gmail.com> | 2014-11-01 14:40:33 -0600 |
| commit | 3fc04b3f6aa8e1332de28b2c8cb2e1289ebe4b50 (patch) | |
| tree | 88e3c283c3f89513a69b8367ed0fab8027bcf791 | |
| parent | 6f09c776ab009ca7bb3af4ad3ef37939b8561b1c (diff) | |
| download | chill-3fc04b3f6aa8e1332de28b2c8cb2e1289ebe4b50.tar.gz chill-3fc04b3f6aa8e1332de28b2c8cb2e1289ebe4b50.tar.bz2 chill-3fc04b3f6aa8e1332de28b2c8cb2e1289ebe4b50.zip | |
Makefile all
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | test-chill/testchill/__main__.py | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -6,7 +6,7 @@ CC = g++ CFLAGS = -g -Wno-write-strings DEPENDENCE_CFLAGS = -M -#OMEGAHOME ?= ./omega +OMEGAHOME=./omega ifdef TEST_COVERAGE CFLAGS := $(CFLAGS) -fprofile-arcs -ftest-coverage diff --git a/test-chill/testchill/__main__.py b/test-chill/testchill/__main__.py index ec60ad1..bd68e16 100644 --- a/test-chill/testchill/__main__.py +++ b/test-chill/testchill/__main__.py @@ -27,6 +27,8 @@ def make_local(argsns, arg_parser): argsns.chill_tc_dir = os.path.join(os.getcwd(), 'test-cases') # formally from the commandline argsns.chill_dir = os.path.abspath(argsns.chill_dir) argsns.omega_dir = os.path.abspath(argsns.omega_dir) + argsns.chill_build_coverage = argsns.coverage_set is not None #TODO: make arg passed to local. + argsns.chill_test_coverage = argsns.coverage_set is not None util.mkdir_p(argsns.wd) util.mkdir_p(argsns.bin_dir) @@ -35,7 +37,7 @@ def make_local(argsns, arg_parser): chill_version = argsns.chill_version for config in chill.ChillConfig.configs(argsns.omega_dir, argsns.chill_dir, argsns.bin_dir, version=chill_version): - build_testcase = chill.BuildChillTestCase(config, coverage_set=argsns.coverage_set) + build_testcase = chill.BuildChillTestCase(config, options={'coverage': argsns.chill_build_coverage}, coverage_set=argsns.coverage_set) yield build_testcase batch_file = os.path.join(argsns.chill_tc_dir, config.name() + '.tclist') for tc in make_batch_testcaselist(argsns, arg_parser, batch_file): @@ -359,10 +361,10 @@ def args_to_tclist(args=sys.argv[1:], arg_parser=make_argparser(), argsns=None, @util.callonce def main(): - #coverage = gcov.GcovSet() - coverage=None + coverage = gcov.GcovSet() + #coverage=None results = list(test.run(args_to_tclist(coverage_set=coverage))) - test.pretty_print_results(results) + #test.pretty_print_results(results) #util.rmtemp() #coverage.pretty_print() |