wvtest_SCRIPTS = get_var.sh bin_scripts.sh all_omk_subdirs-recurs-expanded \
-all_omk_subdirs-simply-expanded automatic_subdirs cmetric \
+all_omk_subdirs-simply-expanded automatic_subdirs clean cmetric \
default-config extra_rules_subdirs header-files headers-generated \
headers-generated-default-cflags headers-nonexisting hooks \
idl ignore_errors includes invocation_dir libraries no-print-directory \
no_vpath omk_config override-config parallel_make programs \
-programs-cflags programs-cxxflags programs-cflags-cmdline programs-defs \
+programs-cflags programs-cxxflags programs-defs \
programs-test_PROGRAMS qt qt-qmake shlibs sources_dir \
sources_in_subdirectory sources_list subdirs_first \
-subdirs_first-force-subdir use_leaf_makefiles vxworks whole_tree
+subdirs_first-force-subdir use_leaf_makefiles vxworks whole_tree omkize
+RULES=$(shell cd ../rules; ls)
all test:
- $(MAKE) -C ..
- ./wvtestrun $(MAKE) wvtest
+ ./wvtool run $(MAKE) wvtest
-wvtest: $(wvtest_SCRIPTS:%=run-%)
+ALL_TESTS = $(foreach rule,$(RULES),$(foreach script,$(wvtest_SCRIPTS),$(rule)/$(script)))
-RULES=$(shell cd ../rules; ls)
+.PHONY: $(ALL_TESTS) wvtest
+wvtest: $(ALL_TESTS)
-run-%: %
-ifeq ($(OMK_RULES),)
- for i in $(RULES); do LC_ALL=C OMK_RULES=$$i ./$* || exit 1; done
-else
- LC_ALL=C ./$*
-endif
+$(ALL_TESTS):
+ -LC_ALL=C OMK_RULES=$(patsubst %/,%,$(dir $@)) ./$(notdir $@)