git p4 test: simplify quoting involving TRASH_DIRECTORY

For temporary files that are created in the top-level TRASH_DIRECTORY,
trust that the tests do not chdir except in subshells, and avoid some
quoting.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 0f410c45f7005e7de1237e556396db5726a22e50..7401c215626fa95fa36b35f8ee2e247c8439c5ca 100755 (executable)
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -126,15 +126,14 @@ test_expect_success 'clone two dirs, @all, conflicting files' '
 '
 
 test_expect_success 'exit when p4 fails to produce marshaled output' '
 '
 
 test_expect_success 'exit when p4 fails to produce marshaled output' '

-       badp4dir="$TRASH_DIRECTORY/badp4dir" &&
-       mkdir "$badp4dir" &&
-       test_when_finished "rm \"$badp4dir/p4\" && rmdir \"$badp4dir\"" &&
-       cat >"$badp4dir"/p4 <<-EOF &&
+       mkdir badp4dir &&
+       test_when_finished "rm badp4dir/p4 && rmdir badp4dir" &&
+       cat >badp4dir/p4 <<-EOF &&

        #!$SHELL_PATH
        exit 1
        EOF
        #!$SHELL_PATH
        exit 1
        EOF

-       chmod 755 "$badp4dir"/p4 &&
-       PATH="$badp4dir:$PATH" git p4 clone --dest="$git" //depot >errs 2>&1 ; retval=$? &&
+       chmod 755 badp4dir/p4 &&
+       PATH="$TRASH_DIRECTORY/badp4dir:$PATH" git p4 clone --dest="$git" //depot >errs 2>&1 ; retval=$? &&

        test $retval -eq 1 &&
        test_must_fail grep -q Traceback errs
 '
        test $retval -eq 1 &&
        test_must_fail grep -q Traceback errs
 '

diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 353dcfbe09fec2c2a85427e3e5cb378b9a8318d8..fb3c8ec12c7a3724c3b4f719c91357cc4afed078 100755 (executable)
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -78,20 +78,19 @@ test_expect_success 'skipSubmitEditCheck' '
 test_expect_success 'no config, edited' '
        git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
 test_expect_success 'no config, edited' '
        git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&

-       ed="$TRASH_DIRECTORY/ed.sh" &&
-       test_when_finished "rm \"$ed\"" &&
-       cat >"$ed" <<-EOF &&
+       test_when_finished "rm ed.sh" &&
+       cat >ed.sh <<-EOF &&

                #!$SHELL_PATH
                sleep 1
                touch "\$1"
                exit 0
        EOF
                #!$SHELL_PATH
                sleep 1
                touch "\$1"
                exit 0
        EOF

-       chmod 755 "$ed" &&
+       chmod 755 ed.sh &&

        (
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 5" &&
        (
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 5" &&

-               P4EDITOR="" EDITOR="\"$ed\"" git p4 submit &&
+               P4EDITOR="" EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" git p4 submit &&

                p4 changes //depot/... >wc &&
                test_line_count = 5 wc
        )
                p4 changes //depot/... >wc &&
                test_line_count = 5 wc
        )

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 83738fa2cdcfbf97c7cb723b2388a31d470fa530..a37c6cbd7c7704636f405fc8ce6059c79933e24a 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -39,10 +39,9 @@ test_expect_success 'clone --branch' '
 '
 
 test_expect_success 'clone --changesfile' '
 '
 
 test_expect_success 'clone --changesfile' '

-       cf="$TRASH_DIRECTORY/cf" &&
-       test_when_finished "rm \"$cf\"" &&
-       printf "1\n3\n" >"$cf" &&
-       git p4 clone --changesfile="$cf" --dest="$git" //depot &&
+       test_when_finished "rm cf" &&
+       printf "1\n3\n" >cf &&
+       git p4 clone --changesfile="$TRASH_DIRECTORY/cf" --dest="$git" //depot &&

        test_when_finished cleanup_git &&
        (
                cd "$git" &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&


@@ -55,10 +54,9 @@ test_expect_success 'clone --changesfile' '
 '
 
 test_expect_success 'clone --changesfile, @all' '
 '
 
 test_expect_success 'clone --changesfile, @all' '

-       cf="$TRASH_DIRECTORY/cf" &&
-       test_when_finished "rm \"$cf\"" &&
-       printf "1\n3\n" >"$cf" &&
-       test_must_fail git p4 clone --changesfile="$cf" --dest="$git" //depot@all
+       test_when_finished "rm cf" &&
+       printf "1\n3\n" >cf &&
+       test_must_fail git p4 clone --changesfile="$TRASH_DIRECTORY/cf" --dest="$git" //depot@all

 '
 
 # imports both master and p4/master in refs/heads
 '
 
 # imports both master and p4/master in refs/heads

diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
index 2f8014a60ef07d84430b9a696d46cd63c4822524..dc92e60cd6f09fa5e2610d491cf1c07d43c45dfd 100755 (executable)
--- a/t/t9808-git-p4-chdir.sh
+++ b/t/t9808-git-p4-chdir.sh
@@ -21,7 +21,7 @@ test_expect_success 'init depot' '
 # environment variable is set
 test_expect_success 'P4CONFIG and absolute dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
 # environment variable is set
 test_expect_success 'P4CONFIG and absolute dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&

-       test_when_finished "rm \"$TRASH_DIRECTORY/p4config\"" &&
+       test_when_finished "rm p4config" &&

        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&


@@ -33,7 +33,7 @@ test_expect_success 'P4CONFIG and absolute dir clone' '
 # same thing, but with relative directory name, note missing $ on --dest
 test_expect_success 'P4CONFIG and relative dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
 # same thing, but with relative directory name, note missing $ on --dest
 test_expect_success 'P4CONFIG and relative dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&

-       test_when_finished "rm \"$TRASH_DIRECTORY/p4config\"" &&
+       test_when_finished "rm p4config" &&

        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&