From 19e7b31b6220e35a8f6924c7c31c56be82553ed5 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 12 Nov 2013 14:56:08 +0100 Subject: [PATCH] Run tests directly with snippets instead of with the preprocessed rules This simplifies debugging failed tests. --- tests/Makefile | 1 - tests/wvtest.sh | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 93aa123..748b82a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -12,7 +12,6 @@ subdirs_first-force-subdir use_leaf_makefiles vxworks whole_tree omkize RULES=$(shell cd ../rules; ls) all test: - $(MAKE) -C .. ./wvtestrun $(MAKE) wvtest ALL_TESTS = $(foreach rule,$(RULES),$(foreach script,$(wvtest_SCRIPTS),$(rule)/$(script))) diff --git a/tests/wvtest.sh b/tests/wvtest.sh index 89e37ec..cd23e3a 100644 --- a/tests/wvtest.sh +++ b/tests/wvtest.sh @@ -139,6 +139,7 @@ WVSTART() mkdir -p "$dir" WVPASS cd "$WV_BASE_DIR/$dir" WVPASS cp "$OMK_TESTSROOT"/../rules/$OMK_RULES/* . + WVPASS cp "$OMK_TESTSROOT"/../snippets/Makefile.rules.$OMK_RULES Makefile.rules WVPASS cp "$OMK_TESTSROOT/../leaf-makefile/Makefile" . } @@ -192,6 +193,8 @@ testdir="tmp/$(basename $0 .sh).$OMK_RULES" WVPASS mkdir -p "$testdir" WVPASS cd "$testdir" WVPASS cp "$OMK_TESTSROOT"/../rules/$OMK_RULES/* . +WVPASS cp "$OMK_TESTSROOT"/../snippets/Makefile.rules.$OMK_RULES Makefile.rules WVPASS cp "$OMK_TESTSROOT/../leaf-makefile/Makefile" . WV_BASE_DIR="$PWD" +export MAKEFLAGS="--include-dir=$OMK_TESTSROOT/../snippets" -- 2.39.2