@@ -4,7 +4,11 @@ PREFIX := sudo -E
RESULTS_DIR := results
## -- End Config --
-TESTS := $(patsubst tests/%,%,$(wildcard tests/*.t))
+rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
+
+TESTS := $(patsubst tests/%,%,$(call rwildcard,tests/,*.t))
+TESTS_DIR := $(dir $(TESTS))
+
IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*))
ifneq (,$(wildcard /proc/config.gz))
@@ -34,6 +38,11 @@ distclean: clean
$(TESTS):
@mkdir -p $(RESULTS_DIR)
+
+ @for d in $(TESTS_DIR); do \
+ mkdir -p $(RESULTS_DIR)/$$d; \
+ done
+
@for i in $(IPVERS); do \
o=`echo $$i | sed -e 's/iproute2\///'`; \
echo -n "Running $@ [$$o/`uname -r`]: "; \
@@ -8,7 +8,7 @@ QDISCS="cbq htb dsmark"
for q in ${QDISCS}; do
ts_log "Preparing classifier testbed with qdisc $q"
- for c in tests/cls/*.t; do
+ for c in tests/cls/*.c; do
case "$q" in
cbq)
Such approach allows to run *.t scripts from any tests/ subdirectories. One point is that tests from tests/cls/*.t (which are needed by tests/cls-testbed.t but does not exist yet) will also be ran aside with tests/cls-testbed.t which is not good because in such case they will be ran twice, so renamed these tests path to tests/cls/*.c in tests/cls-testbed.t Signed-off-by: Vadim Kochan <vadim4j@gmail.com> --- testsuite/Makefile | 11 ++++++++++- testsuite/tests/cls-testbed.t | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-)