summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2014-06-04 12:15:23 +0200
committerAlexander Barton <alex@barton.de>2014-06-04 12:15:23 +0200
commit3de972e0bdbb5da7b13db5628e5373e3ec57cf51 (patch)
tree585dcc8996e068a72a25bdfe32954885a1c6bc66 /contrib
parentec2bf5c5a23e791fda3f2ea4d92c663abb94490a (diff)
downloadngircd-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 'contrib')
-rwxr-xr-xcontrib/platformtest.sh13
1 files changed, 10 insertions, 3 deletions
diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh
index 1067a6e9..e3587fbf 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