From c41fd9cb5f47695077165fb769e1754f7886517e Mon Sep 17 00:00:00 2001 From: dhuth Date: Thu, 9 Oct 2014 11:40:37 -0600 Subject: Small changes to Makefile and test-chill --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 14fe22c..5b091df 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3-70-g09d2 From 6f09c776ab009ca7bb3af4ad3ef37939b8561b1c Mon Sep 17 00:00:00 2001 From: dhuth Date: Tue, 28 Oct 2014 11:40:26 -0600 Subject: make all now makes chill and cuda-chill --- .gitmodules | 0 Makefile | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 .gitmodules (limited to 'Makefile') diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile index 5b091df..200e61a 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -154,7 +154,11 @@ CHILL_OBJS = $(CHILL_SRCS:.cc=.o) CUDACHILL_OBJS = $(CUDACHILL_SRCS:.cc=.o) -all: cuda-chill chill +all: + $(MAKE) depend-chill + $(MAKE) chill + $(MAKE) depend-cuda-chill + $(MAKE) cuda-chill # can't these be combined to a superset of all source files? -- cgit v1.2.3-70-g09d2 From 3fc04b3f6aa8e1332de28b2c8cb2e1289ebe4b50 Mon Sep 17 00:00:00 2001 From: dhuth Date: Sat, 1 Nov 2014 14:40:33 -0600 Subject: Makefile all --- Makefile | 2 +- test-chill/testchill/__main__.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 200e61a..7f2c8b5 100644 --- a/Makefile +++ b/Makefile @@ -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() -- cgit v1.2.3-70-g09d2