summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/Makefile6
-rw-r--r--test/Rules.mak2
-rw-r--r--test/Test.mak7
3 files changed, 3 insertions, 12 deletions
diff --git a/test/Makefile b/test/Makefile
index 5b240f49b..f38427e41 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -42,16 +42,14 @@ DIRS := $(filter-out math,$(DIRS))
test check all: run
-run: compile subdirs_run
+run: subdirs_run
-compile:subdirs_compile
- @echo 0 > $(COUNTER)
+compile: subdirs_compile
tags:
ctags -R
clean: subdirs_clean
- @rm -f $(COUNTER)
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_compile: $(patsubst %, _dircompile_%, $(DIRS))
diff --git a/test/Rules.mak b/test/Rules.mak
index 88a8f7d7f..b74d941b6 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -13,8 +13,6 @@ top_builddir ?= ../
TESTDIR=$(top_builddir)test/
-COUNTER = $(TESTDIR).errcounter
-
include $(top_builddir)/Rules.mak
ifndef TEST_INSTALLED_UCLIBC
ifdef UCLIBC_LDSO
diff --git a/test/Test.mak b/test/Test.mak
index dc416dc7d..af415aa9e 100644
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -65,18 +65,13 @@ define exec_test
test -z "$$expected_ret" && export expected_ret=0 ; \
if ! test $$ret -eq $$expected_ret ; then \
echo "ret == $$ret ; expected_ret == $$expected_ret" ; \
- cat "$(binary_name).out" ; \
- numerr="`cat $(COUNTER)`" ; \
- expr $$numerr + 1 > $(COUNTER) ; \
+ exit 1 ; \
fi
$(SCAT) "$(binary_name).out"
endef
test check all: run
run: $(RUN_TARGETS) compile
- @numerr="`cat $(COUNTER)`" ; \
- echo "Encountered $$numerr errors" ; \
- test $$numerr -eq 0 || exit 1
$(RUN_TARGETS): $(TARGETS)
$(exec_test)