filter: match in two passes, before and after stripping

[solanum.git] / tools / smoketest.sh

diff --git a/tools/smoketest.sh b/tools/smoketest.sh
index ec2f5601b3415b043506232442a6a882975ed14a..f57b71d008b70ca578b64e3708d1b3512a934ef9 100755 (executable)
--- a/tools/smoketest.sh
+++ b/tools/smoketest.sh
@@ -31,7 +31,8 @@ servername=smoke$(date +%Y%m%d%H%M%S).test
 port=$(date +50%S)
 sed -e '/^serverinfo/,/^}/s/name = ".*";/name = "'"$servername"'";/' \
        -e '/^listen/,/^}/s/port = .*;/port = '"$port"';/' \
-       etc/example.conf >etc/ircd.conf || exit 2
+       -e '/^blacklist/,/^}/s/^/#/' \
+       etc/ircd.conf.example >etc/ircd.conf || exit 2
 bin/ircd || exit 2
 ircdpid=$(cat etc/ircd.pid) || exit 2
 cd "$dir" || exit 2
@@ -41,7 +42,7 @@ echo "Will use servername $servername port $port, pid is $ircdpid"
        echo 'NICK test1'
        sleep 1
        echo 'JOIN #test'
-       sleep 1
+       sleep 2
        echo "PRIVMSG #test :channel message via $servername"
        echo "PRIVMSG @#test :chanops 1 via $servername"
        echo "MODE #test +o test2"
@@ -52,7 +53,7 @@ echo "Will use servername $servername port $port, pid is $ircdpid"
 {
        echo 'NICK test2'
        echo 'USER testu2 . . :Test user'
-       sleep 1
+       sleep 2
        echo 'JOIN #test'
        echo "PRIVMSG test1 :private message via $servername"
        sleep 2