Fix 'make -j check'
authorWouter Verhelst <w@uter.be>
Tue, 15 Dec 2009 09:37:57 +0000 (10:37 +0100)
committerWouter Verhelst <w@uter.be>
Tue, 15 Dec 2009 09:37:57 +0000 (10:37 +0100)
Port numbers were the same across all three tests, so that made the
check fail if they were ran at the same time...

simple_test

index cb176bf..6bae6d4 100755 (executable)
@@ -26,12 +26,12 @@ case $1 in
 [generic]
 [export]
        exportname = $tmpnam
 [generic]
 [export]
        exportname = $tmpnam
-       port = 11111
+       port = 11112
 EOF
                ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
                PID=$!
                sleep 1
 EOF
                ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
                PID=$!
                sleep 1
-               ./nbd-tester-client 127.0.0.1 11111
+               ./nbd-tester-client 127.0.0.1 11112
                retval=$?
        ;;
        */cfgmulti)
                retval=$?
        ;;
        */cfgmulti)
@@ -41,18 +41,18 @@ EOF
 [generic]
 [export1]
        exportname = $tmpnam
 [generic]
 [export1]
        exportname = $tmpnam
-       port = 11111
+       port = 11113
        copyonwrite = true
        listenaddr = 127.0.0.1
 [export2]
        exportname = $tmpnam
        copyonwrite = true
        listenaddr = 127.0.0.1
 [export2]
        exportname = $tmpnam
-       port = 11112
+       port = 11114
        readonly = true
 EOF
                ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
                PID=$!
                sleep 1
        readonly = true
 EOF
                ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
                PID=$!
                sleep 1
-               ./nbd-tester-client localhost 11111
+               ./nbd-tester-client localhost 11113
                retval=$?
                if [ $retval -ne 0 ]
                then
                retval=$?
                if [ $retval -ne 0 ]
                then
@@ -66,7 +66,7 @@ EOF
                        rm -f $tmpnam nbd-server.conf
                        exit $retval
                fi
                        rm -f $tmpnam nbd-server.conf
                        exit $retval
                fi
-               ./nbd-tester-client localhost 11112
+               ./nbd-tester-client localhost 11114
                retval=$?
        ;;
        *)
                retval=$?
        ;;
        *)