Module: ngircd.git Branch: master Commit: 3de972e0bdbb5da7b13db5628e5373e3ec57cf51 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3de97...

Author: Alexander Barton alex@barton.de Date: Wed Jun 4 12:15:23 2014 +0200

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.

---

contrib/platformtest.sh | 13 ++++++++++--- src/testsuite/Makefile.ng | 5 +++-- src/testsuite/tests.sh | 5 ++++- 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 1067a6e..e3587fb 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -27,6 +27,7 @@ COMMENT= R_CONFIGURE= R_MAKE= R_CHECK= +R_CHECK_Y="?" R_RUN=

SRC_D=`dirname "$0"` @@ -101,6 +102,8 @@ if [ -r "$SRC_D/configure" ]; then if [ $? -eq 0 ]; then R_CHECK=1 R_RUN=$R_CHECK + [ -r ./src/testsuite/tests-skipped.lst ] \ + && R_CHECK_Y="y" || R_CHECK_Y="Y" else ./src/ngircd/ngircd --help 2>/dev/null \ | grep "^ngIRCd" >/dev/null @@ -180,7 +183,7 @@ fi

[ -n "$R_CONFIGURE" ] && C="Y" || C="N" [ -n "$R_MAKE" ] && M="Y" || M="N" -[ -n "$R_CHECK" ] && T="Y" || T="N" +[ -n "$R_CHECK" ] && T="$R_CHECK_Y" || T="N" [ -n "$R_RUN" ] && R="Y" || R="N" [ -n "$COMMENT" ] && COMMENT=" $COMMENT"

@@ -194,11 +197,15 @@ echo "Platform Compiler ngIRCd Date Tester C M echo "--------------------------- ------------ ---------- -------- -------- - - - - -" type printf >/dev/null 2>&1 if [ $? -eq 0 ]; then - printf "%-27s %-12s %-10s %s %-8s %s %s %s %s%s" \ + printf "%-27s %-12s %-10s %s %-8s %s %s %s %s%s\n" \ "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ "$C" "$M" "$T" "$R" "$COMMENT" else echo "$PLATFORM $COMPILER $VERSION $DATE $USER" \ "$C" "$M" "$T" "$R" "$COMMENT" fi -echo; echo +echo +if [ "$R_CHECK_Y" = "y" ]; then + echo "$NAME: Warning: Some tests have been skipped!" + echo +fi diff --git a/src/testsuite/Makefile.ng b/src/testsuite/Makefile.ng index b906091..d929592 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 1989205..fc4a4d5 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