diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-28 19:17:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-28 19:17:44 +0200 |
| commit | 05df1d32db889cdaea6307a6afb751d9fb7c0ce2 (patch) | |
| tree | b8a7b30c54dc46f8fea485b7c5abbe660f720aa4 | |
| parent | e4d332c787e57abc32dec949ca8def57feae32ce (diff) | |
allow to skip tests, if uClibc-ng feature is disabled
| -rw-r--r-- | test/crypt/sha256c-test.c | 7 | ||||
| -rw-r--r-- | test/crypt/sha512c-test.c | 7 | ||||
| -rw-r--r-- | test/uclibcng-testrunner.sh | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/test/crypt/sha256c-test.c b/test/crypt/sha256c-test.c index 5334cc8..945e294 100644 --- a/test/crypt/sha256c-test.c +++ b/test/crypt/sha256c-test.c @@ -39,9 +39,9 @@ static const struct static int do_test (void) { +#if __UCLIBC_HAS_SHA256_CRYPT_IMPL__ int result = 0; -#if __UCLIBC_HAS_SHA256_CRYPT_IMPL__ int i; for (i = 0; i < ntests; ++i) @@ -55,9 +55,12 @@ do_test (void) result = 1; } } -#endif return result; +#else + return 23; +#endif + } #define TIMEOUT 6 diff --git a/test/crypt/sha512c-test.c b/test/crypt/sha512c-test.c index be55b59..9726e95 100644 --- a/test/crypt/sha512c-test.c +++ b/test/crypt/sha512c-test.c @@ -40,9 +40,9 @@ static const struct static int do_test (void) { +#if __UCLIBC_HAS_SHA512_CRYPT_IMPL__ int result = 0; -#if __UCLIBC_HAS_SHA512_CRYPT_IMPL__ int i; for (i = 0; i < ntests; ++i) @@ -56,9 +56,10 @@ do_test (void) result = 1; } } -#endif - return result; +#else + return 23; +#endif } #define TIMEOUT 6 diff --git a/test/uclibcng-testrunner.sh b/test/uclibcng-testrunner.sh index 943c950..4fd1661 100644 --- a/test/uclibcng-testrunner.sh +++ b/test/uclibcng-testrunner.sh @@ -28,11 +28,18 @@ die() { test -s uclibcng-testrunner.in || die uclibcng-testrunner.in not found nfail=0 +nskip=0 npass=0 while read expected_ret tst_src_name binary_name subdir cmd; do printf '.... %s\r' "$binary_name" (cd $subdir && eval "$cmd" >$binary_name.out 2>&1) </dev/null ret=$? + test $ret = "23" && { + echo "SKIP $binary_name" + nskip=`expr $nskip + 1` + sed 's/^/ /' <$subdir/$binary_name.out + continue + } test $ret = "$expected_ret" || { echo "FAIL $binary_name got $ret expected $expected_ret" nfail=`expr $nfail + 1` @@ -57,6 +64,7 @@ while read expected_ret tst_src_name binary_name subdir cmd; do break done done <uclibcng-testrunner.in +echo Total skipped: $nskip echo Total failed: $nfail echo Total passed: $npass test $nfail = 0 |