summaryrefslogtreecommitdiffstats
path: root/tests/runtest.sh
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu>2008-10-20 10:00:26 +0000
committer/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu </C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu>2008-10-20 10:00:26 +0000
commita96e4fca10506462df4ee4035f0f86f09bd9dc34 (patch)
tree103bed0a7ae3608675f371d2ac91f3fa7f3a58cc /tests/runtest.sh
parentbc2ddd2d8da1252e78a1f25bd91c1e3cd8016ead (diff)
ipset 2.4 release
userspace changes: - Added KBUILD_OUTPUT support (Sven Wegener) - Fix memory leak in ipset_iptreemap (Sven Wegener) - Fix multiple compiler warnings (Sven Wegener) - ipportiphash, ipportnethash and setlist types added - binding marked as deprecated functionality - element separator token changed to ',' in anticipating IPv6 addresses, old separator tokens are still supported - unnecessary includes removed - ipset does not try to resolve IP addresses when listing the content of sets (default changed) - manpage updated - ChangeLog forked for kernel part kernel part changes: - ipportiphash, ipportnethash and setlist types added - set type modules reworked to avoid code duplication as much as possible, code unification macros - expand_macros Makefile target added to help debugging code unification macros - ip_set_addip_kernel and ip_set_delip_kernel changed from void to int, __ip_set_get_byname and __ip_set_put_byid added for the sake of setlist type - unnecessary includes removed - compatibility fix for kernels >= 2.6.27: semaphore.h was moved from asm/ to linux/ (James King) - ChangeLog forked for kernel part
Diffstat (limited to 'tests/runtest.sh')
-rwxr-xr-xtests/runtest.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 028e968..4f2a2d2 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -1,9 +1,15 @@
-#!/bin/sh
+#!/bin/bash
tests="init"
tests+=" ipmap macipmap portmap"
tests+=" iphash nethash ipporthash"
+tests+=" ipportiphash ipportnethash"
tests+=" iptree iptreemap"
+tests+=" setlist"
+
+if [ "$1" ]; then
+ tests="init $@"
+fi
for types in $tests; do
ipset -X test >/dev/null 2>&1
@@ -24,7 +30,7 @@ for types in $tests; do
r=$?
# echo $ret $r
if [ "$ret" = "$r" ]; then
- echo "OK"
+ echo "passed"
else
echo "FAILED"
echo "Failed test: $cmd"
@@ -33,6 +39,8 @@ for types in $tests; do
# sleep 1
done < $types.t
done
+# Remove test sets created by setlist.t
+ipset -X
for x in $tests; do
case $x in
init)
@@ -43,5 +51,5 @@ for x in $tests; do
esac
done
rmmod ip_set >/dev/null 2>&1
-echo "All tests are OK"
+echo "All tests are passed"