Reorder options

GNU getopt() will happily reorder non-option arguments if we ask it to
(which we do), but that's a GNU extension. Since we want to support
FreeBSD too, don't put these arguments at the end, but put them before
non-option arguments.

diff --git a/tests/run/simple_test b/tests/run/simple_test
index c4f15d7..506a46f 100755 (executable)
--- a/tests/run/simple_test
+++ b/tests/run/simple_test
@@ -167,7 +167,7 @@ EOF
                ../../nbd-server -C ${conffile} -p ${pidfile} &
                PID=$!
                sleep 1
-               ./nbd-tester-client -N export1 -w localhost -F
+               ./nbd-tester-client -N export1 -w -F localhost
                retval=$?
        ;;
        */flush)
@@ -275,7 +275,7 @@ EOF
                ../../nbd-server -C ${conffile} -p ${pidfile} &
                PID=$!
                sleep 1
-               ./nbd-tester-client -N export1 -w localhost -F
+               ./nbd-tester-client -N export1 -w -F localhost
                retval=$?
                ;;
        *)