From 8d391512b72d2b8cd9d4f06b0b064794bd55ad6e Mon Sep 17 00:00:00 2001 From: vadimk Date: Thu, 9 Oct 2014 18:51:24 +0300 Subject: [PATCH] tests: Skip cls-testbed.t if tests/cls dir does not exist 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 --- 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 cc4894705..8f76e492d 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 efae2a5d8..f5f997942 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.47.3