iproute2 tests: Fix problem with test running
Subsystems (2)
PATCH v2 1/1 iproute2 tests: Fix problem with test running
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 <[email protected]>
--- testsuite/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
testsuite/Makefile +7 -5
@@ -1,6 +1,7 @@ ## -- Config -- DEV := lo PREFIX := sudo +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; \ + $(PREFIX) TC="$$i/tc/tc" IP="$$i/ip/ip" DEV="$(DEV)" IPVER="$@" SNAME="$$i" \ + ERRF="$(RESULTS_DIR)/$@.$$o.err" $(KENV) 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
Signature · 1 line
2.1.0
I will re-send patch v2 with using "sudo -E".
Quoted 56 lines · Vadim Kochan
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 <[email protected]>--- testsuite/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)testsuite/Makefile +7
-6@@ -1,6 +1,7 @@ ## -- Config -- DEV := lo PREFIX := sudo +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; \ + $(PREFIX) TC="$$i/tc/tc" IP="$$i/ip/ip" DEV="$(DEV)" IPVER="$@" SNAME="$$i" \ + ERRF="$(RESULTS_DIR)/$@.$$o.err" $(KENV) 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