diff options
| author | Alexander Barton <alex@barton.de> | 2014-06-04 12:15:23 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2014-06-04 12:15:23 +0200 |
| commit | 3de972e0bdbb5da7b13db5628e5373e3ec57cf51 (patch) | |
| tree | 585dcc8996e068a72a25bdfe32954885a1c6bc66 /src | |
| parent | ec2bf5c5a23e791fda3f2ea4d92c663abb94490a (diff) | |
| download | ngircd-3de972e0bdbb5da7b13db5628e5373e3ec57cf51.tar.gz ngircd-3de972e0bdbb5da7b13db5628e5373e3ec57cf51.zip | |
Test suite/platformtest.sh: Detect when tests have been skipped
Detect if some tests have been skipped, for example when telnet(1) or expect(1) is missing: ./contrib/platformtest.sh will echo a warning message now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testsuite/Makefile.ng | 5 | ||||
| -rwxr-xr-x | src/testsuite/tests.sh | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/testsuite/Makefile.ng b/src/testsuite/Makefile.ng index b906091e..d929592f 100644 --- a/src/testsuite/Makefile.ng +++ b/src/testsuite/Makefile.ng @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors +# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ EXTRA_DIST = \ all: clean-local: - rm -rf logs tests *-test ngircd-test*.log procs.tmp \ + rm -rf logs tests *-test ngircd-test*.log procs.tmp tests-skipped.lst \ T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd maintainer-clean-local: @@ -39,6 +39,7 @@ ngircd-TEST-Binary: cp ../ngircd/ngircd T-ngircd1 cp ../ngircd/ngircd T-ngircd2 [ -f getpid.sh ] || ln -s $(srcdir)/getpid.sh . + rm -f tests-skipped.lst connect-test: tests.sh rm -f connect-test diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh index 1989205b..fc4a4d5d 100755 --- a/src/testsuite/tests.sh +++ b/src/testsuite/tests.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd Test Suite -# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors. +# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ test=`echo ${name} | cut -d '.' -f 1` [ -d logs ] || mkdir logs if [ ! -r "$test" ]; then + echo "$test: test not found" >>tests-skipped.lst echo "${name}: test \"$test\" not found!"; exit 77 exit 1 fi @@ -27,10 +28,12 @@ fi type expect > /dev/null 2>&1 if [ $? -ne 0 ]; then + echo "$test: \"expect\" not found" >>tests-skipped.lst echo "${name}: \"expect\" not found."; exit 77 fi type telnet > /dev/null 2>&1 if [ $? -ne 0 ]; then + echo "$test: \"telnet\" not found" >>tests-skipped.lst echo "${name}: \"telnet\" not found."; exit 77 fi |