sortm.c: Flip get_fields()'s logic to simplify.

[nmh] / test / install-mh / test-version-check

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 1314f643988f0d2c68457b1fef58b04453d69c5b..dfe6c9b68f2a89d5e3a833ca269f34633687ed69 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -24,6 +24,21 @@ context="${MH_TEST_DIR}"/Mail/context
 version="Version: nmh-${MH_VERSION}"
 cmd="${MH_TEST_DIR}/Mail/cmd"
 
 version="Version: nmh-${MH_VERSION}"
 cmd="${MH_TEST_DIR}/Mail/cmd"
 

+#### Hack:  especially on multicore/multiprocessor machines, need
+#### to allow time for the output file to be closed.  If the output
+#### file never reaches a size greater than zero after waiting for
+#### a short while, let a subsequent check fail to find what it needs.
+#### $1: pid to wait for
+#### $2: output file that must eventually have non-zero size
+wait_for_script() {
+    wait $1
+
+    for i in 1 2 3 4 5 6 7 8 9 10; do
+        test -s "$2"  &&  break  ||  sleep 1
+    done
+}
+
+

 if script -S /bin/sh 'echo OK' /dev/null 2>&1 | egrep 'OK' >/dev/null; then
     #### script(1) uses -S to set the shell that it runs.
     use_dash_S=1
 if script -S /bin/sh 'echo OK' /dev/null 2>&1 | egrep 'OK' >/dev/null; then
     #### script(1) uses -S to set the shell that it runs.
     use_dash_S=1


@@ -34,8 +49,8 @@ echo OK
 EOF
     chmod +x "${cmd}"
 
 EOF
     chmod +x "${cmd}"
 

-    SHELL="${cmd}" script "${actual}" >/dev/null &
-    wait $!
+    (SHELL="${cmd}"; export SHELL; script "${actual}" >/dev/null &
+     wait_for_script $! "${actual}")

     if grep OK "${actual}" >/dev/null; then
         #### script(1) supports SHELL environment variable.
         use_dash_S=0
     if grep OK "${actual}" >/dev/null; then
         #### script(1) supports SHELL environment variable.
         use_dash_S=0


@@ -61,7 +76,7 @@ EOF
         SHELL="${cmd}" script "${actual}" >/dev/null &
     fi
 
         SHELL="${cmd}" script "${actual}" >/dev/null &
     fi
 

-    wait $!
+    wait_for_script $! "${actual}"

 }
 
 #### Ensure that script(1) makes the program look like it's connected to a
 }
 
 #### Ensure that script(1) makes the program look like it's connected to a