testsuite: test --line-buffer --pipe

This commit is contained in:
Ole Tange 2014-02-16 21:53:15 +01:00
parent be7ebcef23
commit 816f851488
3 changed files with 17 additions and 2 deletions

View file

@ -171,6 +171,7 @@ if($opt::pipe) {
drain_job_queue(); drain_job_queue();
::debug("Done draining\n"); ::debug("Done draining\n");
reaper(); reaper();
::debug("Done reaping\n");
if($opt::pipe and @opt::a) { if($opt::pipe and @opt::a) {
for my $job (@Global::tee_jobs) { for my $job (@Global::tee_jobs) {
unlink $job->fh(2,"name"); unlink $job->fh(2,"name");
@ -179,10 +180,12 @@ if($opt::pipe and @opt::a) {
unlink $job->fh(1,"name"); unlink $job->fh(1,"name");
} }
} }
::debug("Cleaning\n");
cleanup(); cleanup();
if($Global::semaphore) { if($Global::semaphore) {
$sem->release(); $sem->release();
} }
::debug("Halt\n");
if($opt::halt_on_error) { if($opt::halt_on_error) {
wait_and_exit($Global::halt_on_error_exitstatus); wait_and_exit($Global::halt_on_error_exitstatus);
} else { } else {

View file

@ -1,7 +1,15 @@
#!/bin/bash #!/bin/bash
cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -j0 -k -L1 cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -j0 -k -L1
echo "bug #41609: --compress fails" echo "### --pipe --line-buffer"
seq 200| parallel -N10 -L1 --pipe -j20 --line-buffer --tagstring {#} pv -qL 10 > /tmp/parallel_$$;
cat /tmp/parallel_$$ | wc;
diff <(sort /tmp/parallel_$$) /tmp/parallel_$$ >/dev/null ; echo These must diff: $?
echo "### --pipe --line-buffer --compress (fails)"
# seq 200| parallel -N10 -L1 --pipe -j20 --line-buffer --compress --tagstring {#} pv -qL 10 | wc
echo "### bug #41609: --compress fails"
seq 12 | parallel --compress --compress-program bzip2 -k seq {} 1000000 | md5sum seq 12 | parallel --compress --compress-program bzip2 -k seq {} 1000000 | md5sum
seq 12 | parallel --compress -k seq {} 1000000 | md5sum seq 12 | parallel --compress -k seq {} 1000000 | md5sum

View file

@ -1,4 +1,8 @@
bug #41609: --compress fails ### --pipe --line-buffer
200 400 1202
These must diff: 1
### --pipe --line-buffer --compress (fails)
### bug #41609: --compress fails
24812dd0f24a26d08a780f988b9d5ad2 - 24812dd0f24a26d08a780f988b9d5ad2 -
24812dd0f24a26d08a780f988b9d5ad2 - 24812dd0f24a26d08a780f988b9d5ad2 -
### Test -I ### Test -I