Check that script(1) supports SHELL in test-version-check.

[nmh] / test / inc / test-pop

diff --git a/test/inc/test-pop b/test/inc/test-pop
index 73c31a87d972234125f1db072d8d0f7f29ff7419..0ae80293d1ca307eaa8be86fa641ab61f0f22f10 100755 (executable)
--- a/test/inc/test-pop
+++ b/test/inc/test-pop
@@ -24,7 +24,7 @@ setup_test
 
 TESTUSER=testuser
 TESTPASS=testuserpass
-arith_eval 64001 + `id -u` % 1000
+arith_eval 64001 + $$ % 1000
 testport=$arith_val
 
 HOME="${MH_TEST_DIR}"; export HOME
@@ -76,7 +76,8 @@ pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
        "Incorporating new mail into inbox...
 
-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do\
+i"
 check "$testmessage" `mhpath +inbox 11` 'keep first'
 
 # Check multiple messages at once
@@ -88,8 +89,8 @@ pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
        "Incorporating new mail into inbox...
 
-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do
-  12  12/18 A Real User        Anything new?<<What's been happening at your pla
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're doi
+  12  12/18 A Real User        Anything new?<<What's been happening at your plac
   13  12/19 Nathan Explosion   Brutal<<Dude, nmh is totally brutal. >>"
 
 check "$testmessage" `mhpath +inbox 11` 'keep first'
@@ -105,11 +106,13 @@ run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80 \
           -pack $MH_TEST_DIR/inc.mbox" \
        "Incorporating new mail into (null)...
 
-   1  12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
+   1  12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do\
+i"
 run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 80" \
        "Incorporating new mail into inbox...
 
-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do\
+i"
 
 check $testmessage `mhpath +inbox 11` 'keep first'
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"
@@ -133,11 +136,11 @@ run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 65 \
           -pack $MH_TEST_DIR/inc.mbox" \
        "Incorporating new mail into (null)...
 
-   1  12/17 No Such User       Hello<<Hey man, how's it going? ." </dev/null
+   1  12/17 No Such User       Hello<<Hey man, how's it going? . " </dev/null
 run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 65" \
        "Incorporating new mail into inbox...
 
-  11+ 12/17 No Such User       Hello<<Hey man, how's it going? ." </dev/null
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? . " </dev/null
 
 check $testmessage `mhpath +inbox 11`
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"