summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ec2bf5c)
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.
R_CONFIGURE=
R_MAKE=
R_CHECK=
R_CONFIGURE=
R_MAKE=
R_CHECK=
R_RUN=
SRC_D=`dirname "$0"`
R_RUN=
SRC_D=`dirname "$0"`
if [ $? -eq 0 ]; then
R_CHECK=1
R_RUN=$R_CHECK
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
else
./src/ngircd/ngircd --help 2>/dev/null \
| grep "^ngIRCd" >/dev/null
[ -n "$R_CONFIGURE" ] && C="Y" || C="N"
[ -n "$R_MAKE" ] && M="Y" || M="N"
[ -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"
[ -n "$R_RUN" ] && R="Y" || R="N"
[ -n "$COMMENT" ] && COMMENT=" $COMMENT"
echo "--------------------------- ------------ ---------- -------- -------- - - - - -"
type printf >/dev/null 2>&1
if [ $? -eq 0 ]; then
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
"$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \
"$C" "$M" "$T" "$R" "$COMMENT"
else
echo "$PLATFORM $COMPILER $VERSION $DATE $USER" \
"$C" "$M" "$T" "$R" "$COMMENT"
fi
+echo
+if [ "$R_CHECK_Y" = "y" ]; then
+ echo "$NAME: Warning: Some tests have been skipped!"
+ echo
+fi
#
# ngIRCd -- The Next Generation IRC Daemon
#
# 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
#
# 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
- 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:
T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd
maintainer-clean-local:
cp ../ngircd/ngircd T-ngircd1
cp ../ngircd/ngircd T-ngircd2
[ -f getpid.sh ] || ln -s $(srcdir)/getpid.sh .
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
connect-test: tests.sh
rm -f connect-test
#!/bin/sh
#
# ngIRCd Test Suite
#!/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
#
# 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
[ -d logs ] || mkdir logs
if [ ! -r "$test" ]; then
[ -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
echo "${name}: test \"$test\" not found!"; exit 77
exit 1
fi
type expect > /dev/null 2>&1
if [ $? -ne 0 ]; then
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 "${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
echo "${name}: \"telnet\" not found."; exit 77
fi