[Nbd] [PATCH] Fix tests on OS-X
simple_test currently relies on what I believe to be an undocument
use of getopt (or possibly a GNU extension) where the options can
FOLLOW the non-option part of the command line. This is unnecessary.
Correct three tests that do this to use natural command-line
ordering.
Signed-off-by: Alex Bligh <alex@...872...>
---
tests/run/simple_test | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/run/simple_test b/tests/run/simple_test
index baee64e..0c05ea1 100755
--- a/tests/run/simple_test
+++ b/tests/run/simple_test
@@ -53,7 +53,7 @@ EOF
# -DNODAEMON, which I sometimes do for testing and debugging.
PID=$!
sleep 1
- ./nbd-tester-client -o 127.0.0.1 -N export
+ ./nbd-tester-client -o -N export 127.0.0.1
retval=$?
;;
*/cfg1)
@@ -66,7 +66,7 @@ EOF
../../nbd-server -C ${conffile} -p ${pidfile} &
PID=$!
sleep 1
- ./nbd-tester-client 127.0.0.1 -N export
+ ./nbd-tester-client -N export 127.0.0.1
retval=$?
;;
*/cfgmulti)
@@ -86,7 +86,7 @@ EOF
../../nbd-server -C ${conffile} -p ${pidfile} &
PID=$!
sleep 1
- ./nbd-tester-client localhost -N export1
+ ./nbd-tester-client -N export1 localhost
retval=$?
if [ $retval -ne 0 ]
then
@@ -102,7 +102,7 @@ EOF
fi
exit $retval
fi
- ./nbd-tester-client localhost -N export2
+ ./nbd-tester-client -N export2 localhost
retval=$?
;;
*/cfgnew)
--
1.9.1
Reply to: