Fix error in test runner

[omk.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index a2921ca9ba17e34e2d1e2ad5106094653fc90427..8ac0efad1c5e65b7ca149903a3394df7d3f7f079 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,17 +1,16 @@
-wvtest_SCRIPTS = bin_scripts.sh all_omk_subdirs.inc                    \
-all_omk_subdirs-recurs-expanded all_omk_subdirs-simply-expanded                \
-automatic_subdirs bin_scripts.sh cmetric default-config                        \
-extra_rules_subdirs header-files headers-generated                     \
+wvtest_SCRIPTS = get_var.sh bin_scripts.sh all_omk_subdirs-recurs-expanded \
+all_omk_subdirs-simply-expanded automatic_subdirs cmetric              \
+default-config extra_rules_subdirs header-files headers-generated      \
 headers-generated-default-cflags headers-nonexisting hooks             \
-ignore_errors includes invocation_dir libraries no-print-directory     \
+idl ignore_errors includes invocation_dir libraries no-print-directory \
 no_vpath omk_config override-config parallel_make programs             \
-programs-cflags programs-cflags-cmdline programs-defs                  \
+programs-cflags programs-cxxflags programs-cflags-cmdline 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
 
 
-all:
+all test:
        $(MAKE) -C ..
        ./wvtestrun $(MAKE) wvtest
 
@@ -20,4 +19,8 @@ wvtest: $(wvtest_SCRIPTS:%=run-%)
 RULES=$(shell cd ../rules; ls)
 
 run-%: %
-       for i in $(RULES); do OMK_RULES=$$i ./$* || break; done
+ifeq ($(OMK_RULES),)
+       for i in $(RULES); do LC_ALL=C OMK_RULES=$$i ./$* || exit 1; done
+else
+       LC_ALL=C ./$*
+endif