DORMANTno replies

[PATCH iproute2] tests: Skip cls-testbed.t if tests/cls dir does not exist

From: Vadim Kochan <hidden>
Date: 2014-10-09 16:00:07
Subsystem: the rest · Maintainer: Linus Torvalds

Curently tests/cls-testbed.t tries to run any *.t in
tests/cls/ folder but such folder does not exist.

Signed-off-by: Vadim Kochan <redacted>
---
 testsuite/lib/generic.sh      | 5 +++++
 testsuite/tests/cls-testbed.t | 5 +++++
 2 files changed, 10 insertions(+)
diff --git a/testsuite/lib/generic.sh b/testsuite/lib/generic.sh
index cc48947..8f76e49 100644
--- a/testsuite/lib/generic.sh
+++ b/testsuite/lib/generic.sh
@@ -21,6 +21,11 @@ ts_err_cat()
 	ts_cat "$@" | tee >> $ERRF
 }
 
+ts_skip()
+{
+    exit 127
+}
+
 ts_tc()
 {
 	SCRIPT=$1; shift
diff --git a/testsuite/tests/cls-testbed.t b/testsuite/tests/cls-testbed.t
index efae2a5..f5f9979 100755
--- a/testsuite/tests/cls-testbed.t
+++ b/testsuite/tests/cls-testbed.t
@@ -5,6 +5,11 @@ source lib/generic.sh
 
 QDISCS="cbq htb dsmark"
 
+if [ ! -d tests/cls ]; then
+    ts_log "tests/cls folder does not exist"
+    ts_skip
+fi
+
 for q in ${QDISCS}; do
 	ts_log "Preparing classifier testbed with qdisc $q"
 
-- 
2.1.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help