Changeset 2284 in kBuild

Timestamp:

Feb 25, 2009 3:58:14 AM (16 years ago)

Author:

bird

Message:

kash/tests: more tests.

Location:

trunk/src/kash/tests

Files:

• Makefile.kmk (modified) (1 diff, 1 prop)
• common-include.sh (added)
• redirect-1 (added)
• redirect-2 (added)
• redirect-3 (added)
• tick-1 (added)

trunk/src/kash/tests/Makefile.kmk

@@ -34 +34 @@
 
 KASH_TEST_BIN   = $(if $(kash_1_TARGET),$(kash_1_TARGET),$(PATH_INS)/$(TEMPLATE_BIN_INST)kash$(SUFF_EXE))
-KASH_TESTCASES := $(addprefix $(PATH_SUB_CURRENT)/,\
+KASH_TEST_DIR  := $(PATH_SUB_CURRENT)
+KASH_TESTCASES := $(addprefix $(KASH_TEST_DIR)/,\
         trap-exit-1 \
         trap-int-1 \
         trap-term-1 \
+        tick-1 \
+        redirect-1 \
+        redirect-2 \
+        redirect-3 \
         )
 
 
-kash_tests:
+kash_tests::
         $(ECHO) "kash tests..."
+        @export KASH_TEST_DIR=$(KASH_TEST_DIR); \
+        KASH_FAILURE=0; \
         $(foreach test,$(KASH_TESTCASES)\
-                ,@$(ECHO) " * $(KASH_TEST_BIN) $(test)" $(NLTAB)\
-                @if $(KASH_TEST_BIN) $(test); then echo " *   ==> SUCCESS"; else echo " *   ==> FAILURE!"; exit 1; fi $(NLTAB)\
-                )
+                ,echo " * $(KASH_TEST_BIN) $(test)"; \
+                if ! $(KASH_TEST_BIN) $(test); then \
+                        echo " => FAILURE!"; \
+                        KASH_FAILURE=`$(EXPR_EXT) $${KASH_FAILURE} + 1`; \
+                fi; \
+                ) \
+        if test $$KASH_FAILURE -eq 0; then \
+                echo 'kash tests: All tests succeeded.'; \
+        else \
+                echo "kash tests: $$KASH_FAILURE kash test failed"'!!'; \
+                exit 1; \
+        fi