[PATCH v2] iproute2 tests: Fix problem with test running
From: Vadim Kochan <hidden>
Date: 2014-09-06 10:35:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
Tests were not allowed to be ran, the following
issues were fixed:
- creating the results folder before test running
- sudo $PREFIX moved before variables definition which
allow to pass them through the sudo to test script.
Signed-off-by: Vadim Kochan <redacted>
---
testsuite/Makefile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/testsuite/Makefile b/testsuite/Makefile
index 2a4e0ba..b4ab15e 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile@@ -1,6 +1,7 @@ ## -- Config -- DEV := lo -PREFIX := sudo +PREFIX := sudo -E +RESULTS_DIR := results ## -- End Config -- TESTS := $(patsubst tests/%,%,$(wildcard tests/*.t))
@@ -23,23 +24,24 @@ listtests: alltests: $(TESTS) clean: - @rm -rf results/* + @rm -rf $(RESULTS_DIR) distclean: clean echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..; $(TESTS): + @mkdir -p $(RESULTS_DIR) @for i in $(IPVERS); do \ o=`echo $$i | sed -e 's/iproute2\///'`; \ echo -n "Running $@ [$$o/`uname -r`]: "; \ TC="$$i/tc/tc" IP="$$i/ip/ip" DEV="$(DEV)" IPVER="$@" SNAME="$$i" \ - ERRF="results/$@.$$o.err" $(KENV) $(PREFIX) tests/$@ > results/$@.$$o.out; \ + ERRF="$(RESULTS_DIR)/$@.$$o.err" $(KENV) $(PREFIX) tests/$@ > $(RESULTS_DIR)/$@.$$o.out; \ if [ "$$?" = "127" ]; then \ echo "SKIPPED"; \ - elif [ -e "results/$@.$$o.err" ]; then \ + elif [ -e "$(RESULTS_DIR)/$@.$$o.err" ]; then \ echo "FAILED"; \ else \ echo "PASS"; \ fi; \ - dmesg > results/$@.$$o.dmesg; \ + dmesg > $(RESULTS_DIR)/$@.$$o.dmesg; \ done
--
2.1.0