From 9e0541c95a821fbee59268967ba6407ec2bc7711 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Mon, 4 Feb 2013 22:39:32 +0100
Subject: [PATCH] testsuite: Passes testsuite. 'timeout' removed as it did not
 work.

---
 src/parallel                    | 26 ++++++++------------------
 testsuite/Start.sh              |  4 ++--
 testsuite/wanted-results/test13 |  2 +-
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/parallel b/src/parallel
index a6f8d89e..b074a0a3 100755
--- a/src/parallel
+++ b/src/parallel
@@ -288,17 +288,17 @@ sub spreadstdin {
 	# If both --recstart and --recend is given then both must match
 	$recstart = $opt::recstart;
 	$recend = $opt::recend;
-	$recerror = "parallel: Warning: --recend and --recstart unmatched. Is --blocksize too small?";
+	$recerror = "parallel: Warning: --recend and --recstart unmatched. Increasing --blocksize.";
     } elsif(defined($opt::recstart)) {
 	# If --recstart is given it must match start of record
 	$recstart = $opt::recstart;
 	$recend = "";
-	$recerror = "parallel: Warning: --recstart unmatched. Is --blocksize too small?";
+	$recerror = "parallel: Warning: --recstart unmatched. Increasing --blocksize.";
     } elsif(defined($opt::recend)) {
 	# If --recend is given then it must match end of record
 	$recstart = "";
 	$recend = $opt::recend;
-	$recerror = "parallel: Warning: --recend unmatched. Is --blocksize too small?";
+	$recerror = "parallel: Warning: --recend unmatched. Increasing --blocksize.";
     }
 
     if($opt::regexp) {
@@ -316,20 +316,7 @@ sub spreadstdin {
     for my $in (@fhlist) {
 	piperead: while(1) {
 	    eof($in) and $force_one_time_through++ and last piperead;
-#	    if(0 and $Global::max_lines and $Global::max_number_of_args) {
-#		# Read $Global::max_number_of_args records of $Global::max_lines lines
-#		my @lines;
-#		my $read_n_lines = ($Global::max_number_of_args || 1) * $Global::max_lines;
-#		for(my $t = 0; !eof($in) and $t < $read_n_lines; $t++) {
-#		    my $l = <$in>;
-#		    push @lines, $l;
-#		}
-#		substr($buf,length $buf,0) = join("",@lines);
-#	    } else {
-		# Read a block
-		read($in,substr($buf,length $buf,0),$opt::blocksize);
-		# substr above = append to $buf
-#	    }
+	    read($in,substr($buf,length $buf,0),$opt::blocksize);
 
 	    if($opt::r) {
 		# Remove empty lines
@@ -346,7 +333,7 @@ sub spreadstdin {
 		    $n_lines--;
 		    $last_newline_pos = rindex($buf,"\n",$last_newline_pos-1);
 		}
-		# Chop at $last_newline_pos
+		# Chop at $last_newline_pos as that is where n-line record ends
 		write_record_to_pipe(\$header,\$buf,$recstart,$recend,$last_newline_pos+1);
 		substr($buf,0,$last_newline_pos+1) = "";
 	    } elsif($opt::regexp) {
@@ -383,6 +370,9 @@ sub spreadstdin {
 		    }
 		}
 	    }
+	    # If stuff not written: 
+	    #   Warn $recerror if not already done
+	    #   blocksize *= 1.1
 	}
     }
 
diff --git a/testsuite/Start.sh b/testsuite/Start.sh
index 6762ddb6..b21897e1 100644
--- a/testsuite/Start.sh
+++ b/testsuite/Start.sh
@@ -11,13 +11,13 @@ if [ "$TRIES" = "3" ] ; then
   # Try a failing test thrice
   echo Retrying 3 times
   ls -t tests-to-run/*${1}*.sh |
-    perl -pe 's:(.*/(.*)).sh:timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh: ' \
+    perl -pe 's:(.*/(.*)).sh:bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 >/dev/null || bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh: ' \
     >$SHFILE
 else
   # Run a failing test once
   echo Not retrying
   ls -t tests-to-run/*${1}*.sh |
-    perl -pe 's:(.*/(.*)).sh:timeout '$TIMEOUT' bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh:' \
+    perl -pe 's:(.*/(.*)).sh:bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2 || touch $1.sh:' \
     >$SHFILE
 fi
 
diff --git a/testsuite/wanted-results/test13 b/testsuite/wanted-results/test13
index 2ae8b3db..c18ee2e5 100644
--- a/testsuite/wanted-results/test13
+++ b/testsuite/wanted-results/test13
@@ -1,5 +1,5 @@
 ### Test -k
-parallel: Warning: Only enough filehandles to run 19 jobs in parallel. Raising ulimit -n may help.
+parallel: Warning: Only enough filehandles to run 20 jobs in parallel. Raising ulimit -n may help.
 begin
 1
 2