From 594ca7576a44ab669890384fb62480259f2d6cf5 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Wed, 8 Aug 2012 22:39:50 +0200
Subject: [PATCH] testsuite: Getting rid of 'mop'.

---
 testsuite/tests-to-run/parallel-local22.sh | 58 +++++++++++++++-------
 testsuite/wanted-results/parallel-local22  | 25 ++++++----
 2 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/testsuite/tests-to-run/parallel-local22.sh b/testsuite/tests-to-run/parallel-local22.sh
index e7ad64d5..34ceccdd 100755
--- a/testsuite/tests-to-run/parallel-local22.sh
+++ b/testsuite/tests-to-run/parallel-local22.sh
@@ -1,24 +1,44 @@
 #!/bin/bash
 
-echo '### This causes problems if we kill child processes'
-seq 1 40 | parallel -j 0 seq 1 10  | sort |md5sum
-seq 1 40 | parallel -j 0 seq 1 10 '| parallel -j 3 echo' | sort |md5sum
+cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -k -L1
+echo '### Test of xargs -m command lines > 130k'; 
+  seq 1 60000 | parallel -m -j1 echo a{}b{}c | tee >(wc) >(sort |md5sum) >/tmp/a$$; 
+  wait; 
+  CHAR=$(cat /tmp/a$$ | wc -c); 
+  LINES=$(cat /tmp/a$$ | wc -l); 
+  echo "Chars per line:" $(echo "$CHAR/$LINES" | bc); 
+  rm /tmp/a$$
 
-echo '### Test of xargs -m and -X'
-seq 1 60000 | parallel -j1 -m echo  | mop -d 4 "|sort |md5sum" "| wc"
-(echo foo;echo bar) | parallel -j1 -m echo 1{}2{}3 A{}B{}C
-(echo foo;echo bar) | parallel -j1 -X echo 1{}2{}3 A{}B{}C
-seq 1 60000 | parallel -m -j1 echo a{}b{}c | mop -d 4 "|sort |md5sum" "| wc"
-seq 1 60000 | parallel -m -j1 echo a{}b{}c | \
-  mop -q "|sort |md5sum" :par
-echo -n "Chars per line: "
-CHAR=$(cat ~/.mop/:par | wc -c)
-LINES=$(cat ~/.mop/:par | wc -l)
-echo "$CHAR/$LINES" | bc
+echo '### Test of xargs -X command lines > 130k'; 
+  seq 1 60000 | parallel -X -j1 echo a{}b{}c | tee >(wc) >(sort |md5sum) >/tmp/b$$; 
+  wait; 
+  CHAR=$(cat /tmp/b$$ | wc -c); 
+  LINES=$(cat /tmp/b$$ | wc -l); 
+  echo "Chars per line:" $(echo "$CHAR/$LINES" | bc); 
+  rm /tmp/b$$
 
-echo '### Bug before 2009-08-26 causing regexp compile error or infinite loop'
-echo a | parallel -qX echo  "'"{}"' "
-echo a | parallel -qX echo  "'{}'"
+echo '### Test of xargs -m command lines > 130k'; 
+  seq 1 60000 | parallel -k -j1 -m echo | md5sum
 
-echo '### nice and tcsh and Bug #33995: Jobs executed with sh instead of $SHELL'
-seq 1 2 | SHELL=tcsh stdout parallel -k --nice 8 setenv a b\;echo \$SHELL
+echo '### This causes problems if we kill child processes'; 
+  seq 1 40 | parallel -j 0 seq 1 10  | sort |md5sum
+
+echo '### This causes problems if we kill child processes (II)'; 
+  seq 1 40 | parallel -j 0 seq 1 10 '| parallel -j 3 echo' | sort | md5sum
+
+echo '### Test -m'; 
+  (echo foo;echo bar) | parallel -j1 -m echo 1{}2{}3 A{}B{}C
+
+echo '### Test -X'; 
+  (echo foo;echo bar) | parallel -j1 -X echo 1{}2{}3 A{}B{}C
+
+echo '### Bug before 2009-08-26 causing regexp compile error or infinite loop'; 
+  echo a | parallel -qX echo  "'"{}"' "
+
+echo '### Bug before 2009-08-26 causing regexp compile error or infinite loop (II)'; 
+  echo a | parallel -qX echo  "'{}'"
+
+echo '### nice and tcsh and Bug #33995: Jobs executed with sh instead of $SHELL'; 
+  seq 1 2 | SHELL=tcsh stdout parallel -k --nice 8 setenv a b\;echo \$SHELL
+
+EOF
diff --git a/testsuite/wanted-results/parallel-local22 b/testsuite/wanted-results/parallel-local22
index 31e770d2..6d6d7992 100644
--- a/testsuite/wanted-results/parallel-local22
+++ b/testsuite/wanted-results/parallel-local22
@@ -1,17 +1,24 @@
-### This causes problems if we kill child processes
-33bf8b2986551515cdaff5e860618098  -
-d7fb96d6a56d4347bc24930a395c431a  -
-### Test of xargs -m and -X
-b35d8e49be8d94899b719c40d3f1f4bb  -
-      3   60000  348894
-1foo bar2foo bar3 Afoo barBfoo barC
-1foo2foo3 1bar2bar3 AfooBfooC AbarBbarC
-31d9274be5fdc2de59487cb05ba57776  -
+### Test of xargs -m command lines > 130k
       6  119994  697800
 31d9274be5fdc2de59487cb05ba57776  -
 Chars per line: 116300
+### Test of xargs -X command lines > 130k
+      7   60000  817788
+22074f9acada52462defb18ba912d744  -
+Chars per line: 116826
+### Test of xargs -m command lines > 130k
+b35d8e49be8d94899b719c40d3f1f4bb  -
+### This causes problems if we kill child processes
+33bf8b2986551515cdaff5e860618098  -
+### This causes problems if we kill child processes (II)
+d7fb96d6a56d4347bc24930a395c431a  -
+### Test -m
+1foo bar2foo bar3 Afoo barBfoo barC
+### Test -X
+1foo2foo3 1bar2bar3 AfooBfooC AbarBbarC
 ### Bug before 2009-08-26 causing regexp compile error or infinite loop
 'a' 
+### Bug before 2009-08-26 causing regexp compile error or infinite loop (II)
 'a'
 ### nice and tcsh and Bug #33995: Jobs executed with sh instead of $SHELL
 tcsh 1