Fix bug in clean target

[omk.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 8ba701abf2d81c2b9474307885a0f7d1f94469dc..495e0d182eb332e1349c0dbecf93346477aa77da 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,14 +1,23 @@
-wvtest_SCRIPTS = bin_scripts.sh
+wvtest_SCRIPTS = get_var.sh bin_scripts.sh all_omk_subdirs-recurs-expanded \
+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-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 omkize
 
-all:
-       $(MAKE) -C ..
-       find -name 'runtest*' -a ! -name '*.rules' -print0|xargs -0 chmod +x
+RULES=$(shell cd ../rules; ls)
+
+all test:
        ./wvtestrun $(MAKE) wvtest
 
-wvtest: $(wvtest_SCRIPTS:%=run-%)
-       python tester.py --wvtest || true
+ALL_TESTS = $(foreach rule,$(RULES),$(foreach script,$(wvtest_SCRIPTS),$(rule)/$(script)))
 
-RULES=$(shell cd ../rules; ls)
+.PHONY: $(ALL_TESTS) wvtest
+wvtest: $(ALL_TESTS)
 
-run-%: %
-       for i in $(RULES); do OMK_RULES=$$i ./$* || break; done
+$(ALL_TESTS):
+       -LC_ALL=C OMK_RULES=$(patsubst %/,%,$(dir $@)) ./$(notdir $@)