From 707d3a52eb9f9af07bb52b0f58a3a8910d21ed82 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Sun, 23 Nov 2008 19:50:20 +0000 Subject: [PATCH] fstest for Linux: - Use /dev/urandom, it is more portable. - Implement todo() function which allows to mark known failures. --- tools/regression/fstest/tests/misc.sh | 31 +++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/regression/fstest/tests/misc.sh b/tools/regression/fstest/tests/misc.sh index 1b742a0365b7..76233d7eae21 100644 --- a/tools/regression/fstest/tests/misc.sh +++ b/tools/regression/fstest/tests/misc.sh @@ -27,7 +27,12 @@ expect() if [ $? -eq 0 ]; then echo "ok ${ntest}" else - echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + if [ -z "${todomsg}" ]; then + echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + else + echo "not ok ${ntest} # TODO ${todomsg}" + todomsg="" + fi fi ntest=`expr $ntest + 1` } @@ -43,7 +48,12 @@ jexpect() if [ $? -eq 0 ]; then echo "ok ${ntest}" else - echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + if [ -z "${todomsg}" ]; then + echo "not ok ${ntest} - tried '$*', expected ${e}, got ${r}" + else + echo "not ok ${ntest} # TODO ${todomsg}" + todomsg="" + fi fi ntest=`expr $ntest + 1` } @@ -53,14 +63,27 @@ test_check() if [ $* ]; then echo "ok ${ntest}" else - echo "not ok ${ntest}" + if [ -z "${todomsg}" ]; then + echo "not ok ${ntest}" + else + echo "not ok ${ntest} # TODO ${todomsg}" + todomsg="" + fi fi ntest=`expr $ntest + 1` } +todo() +{ + echo "${os}" | grep -iq "${1}" + if [ $? -eq 0 ]; then + todomsg="${2}" + fi +} + namegen() { - echo "fstest_`dd if=/dev/random bs=1k count=1 2>/dev/null | openssl md5`" + echo "fstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5`" } quick_exit()