tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-22 14:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug #44371: --trc with csh complains

Browse source
This commit is contained in:
Ole Tange 2015-03-07 23:41:45 +01:00
parent d0fb3a103f
commit 26a94004c9
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/parallel
View file

@ -5188,7 +5188,7 @@ sub cleanup_cmd {
$dir .= $_."/"; $dir .= $_."/";
unshift @rmdir, ::shell_quote_file($dir); unshift @rmdir, ::shell_quote_file($dir);
} }
my $rmdir = @rmdir ? "rmdir @rmdir 2>/dev/null;" : ""; my $rmdir = @rmdir ? "rmdir @rmdir >&/dev/null;" : "";
if(defined $opt::workdir and $opt::workdir eq "...") { if(defined $opt::workdir and $opt::workdir eq "...") {
$rmdir .= "rm -rf " . ::shell_quote_file($workdir).';'; $rmdir .= "rm -rf " . ::shell_quote_file($workdir).';';
} }

4
testsuite/tests-to-run/parallel-local-ssh4.sh
View file

@ -53,8 +53,10 @@ echo '### These blocked due to length'
parallel -Scsh@lo --tmux echo ::: 111111111111111111111111111111111111111111111111111111111 parallel -Scsh@lo --tmux echo ::: 111111111111111111111111111111111111111111111111111111111
echo '### bug #43746: --transfer and --return of multiple inputs {1} and {2}' echo '### bug #43746: --transfer and --return of multiple inputs {1} and {2}'
echo '### and:'
echo '### bug #44371: --trc with csh complains'
cd /tmp; echo 1 > file1; echo 2 > file2; cd /tmp; echo 1 > file1; echo 2 > file2;
parallel -Sparallel@lo --trc {1}.a --trc {2}.b 'echo A {1} > {1}.a; echo B {2} > {2}.b' ::: file1 ::: file2; parallel -Scsh@lo --trc {1}.a --trc {2}.b 'echo A {1} > {1}.a; echo B {2} > {2}.b' ::: file1 ::: file2;
cat file1.a file2.b; cat file1.a file2.b;
rm /tmp/file1 /tmp/file2 /tmp/file1.a /tmp/file2.b rm /tmp/file1 /tmp/file2 /tmp/file1.a /tmp/file2.b

6
testsuite/wanted-results/parallel-local-ssh4
View file

@ -58,6 +58,10 @@ echo '### These blocked due to length'
parallel -Scsh@lo --tmux echo ::: 111111111111111111111111111111111111111111111111111111111 parallel -Scsh@lo --tmux echo ::: 111111111111111111111111111111111111111111111111111111111
echo '### bug #43746: --transfer and --return of multiple inputs {1} and {2}' echo '### bug #43746: --transfer and --return of multiple inputs {1} and {2}'
### bug #43746: --transfer and --return of multiple inputs {1} and {2} ### bug #43746: --transfer and --return of multiple inputs {1} and {2}
cd /tmp; echo 1 > file1; echo 2 > file2; parallel -Sparallel@lo --trc {1}.a --trc {2}.b 'echo A {1} > {1}.a; echo B {2} > {2}.b' ::: file1 ::: file2; cat file1.a file2.b; rm /tmp/file1 /tmp/file2 /tmp/file1.a /tmp/file2.b echo '### and:'
### and:
echo '### bug #44371: --trc with csh complains'
### bug #44371: --trc with csh complains
cd /tmp; echo 1 > file1; echo 2 > file2; parallel -Scsh@lo --trc {1}.a --trc {2}.b 'echo A {1} > {1}.a; echo B {2} > {2}.b' ::: file1 ::: file2; cat file1.a file2.b; rm /tmp/file1 /tmp/file2 /tmp/file1.a /tmp/file2.b
A file1 A file1
B file2 B file2