diff options
| author | Luke Diamand <luke@diamand.org> | 2015-05-19 23:23:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:18:02 -0700 |
| commit | f3b5b07c3c7a8494d78e975d689b6c4479e6b0f3 (patch) | |
| tree | 9c5099adbceb9a181445846d1459cd5ee064dda7 /t/t9803-git-p4-shell-metachars.sh | |
| parent | 2dade7a7b20902a145d1c130830bcb4d4b288a32 (diff) | |
| download | git-f3b5b07c3c7a8494d78e975d689b6c4479e6b0f3.tar.gz | |
git-p4: tests: use test-chmtime in place of touchld/p4-editor-multi-words
Using "touch" for P4EDITOR means that the tests can be a bit
racy, since git-p4 checks the timestamp has been updated and
fails if the timestamp is not updated.
Use test-chmtime instead, which is designed for this.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9803-git-p4-shell-metachars.sh')
| -rwxr-xr-x | t/t9803-git-p4-shell-metachars.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9803-git-p4-shell-metachars.sh b/t/t9803-git-p4-shell-metachars.sh index fbacff34fe..d950c7d665 100755 --- a/t/t9803-git-p4-shell-metachars.sh +++ b/t/t9803-git-p4-shell-metachars.sh @@ -28,7 +28,7 @@ test_expect_success 'shell metachars in filenames' ' echo f2 >"file with spaces" && git add "file with spaces" && git commit -m "add files" && - P4EDITOR=touch git p4 submit + P4EDITOR="test-chmtime +5" git p4 submit ) && ( cd "$cli" && @@ -47,7 +47,7 @@ test_expect_success 'deleting with shell metachars' ' git rm foo\$bar && git rm file\ with\ spaces && git commit -m "remove files" && - P4EDITOR=touch git p4 submit + P4EDITOR="test-chmtime +5" git p4 submit ) && ( cd "$cli" && |