From 71321f49a313f41ae743d99a6ffc52ae5fa88ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 7 Nov 2002 11:19:34 +0100
Subject: [PATCH] Copied new version rom lsh/src/testsuite. This version
handles test scripts located in $srcdir.
Rev: src/nettle/testsuite/run-tests:1.6
---
testsuite/run-tests | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/testsuite/run-tests b/testsuite/run-tests
index 0982fd2d..87a04a46 100755
--- a/testsuite/run-tests
+++ b/testsuite/run-tests
@@ -3,9 +3,23 @@
failed=0
all=0
+if [ -z "$srcdir" ] ; then
+ srcdir=`pwd`
+fi
+
+export srcdir
+
+find_program () {
+ if [ -x "$1" ] ; then
+ echo "./$1"
+ else
+ echo "$srcdir/$1"
+ fi
+}
+
env_program () {
- if [ -x ./"$1" ] ; then
- if ./"$1"; then : ; else
+ if [ -x "$1" ] ; then
+ if "$1"; then : ; else
echo FAIL: $1
exit 1
fi
@@ -13,8 +27,8 @@ env_program () {
}
test_program () {
- testname=`echo "$1" | sed -e 's,-test$,,' -e 's,^\./,,'`
- "./$1"
+ testname=`basename "$1" -test`
+ "$1"
case "$?" in
0)
echo PASS: $testname
@@ -31,12 +45,12 @@ test_program () {
esac
}
-env_program setup-env
+env_program `find_program setup-env`
if [ $# -eq 0 ] ; then
- for f in *-test; do test_program "$f"; done
+ for f in *-test; do test_program "./$f"; done
else
- for f in "$@" ; do test_program "$f"; done
+ for f in "$@" ; do test_program `find_program "$f"`; done
fi
if [ $failed -eq 0 ] ; then
@@ -49,7 +63,7 @@ echo "$dashes"
echo "$banner"
echo "$dashes"
-env_program teardown-env
+env_program `find_program teardown-env`
[ "$failed" -eq 0 ]
--
GitLab