From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Jul 2012 16:02:11 +0000 (-0700)
Subject: Merge branch 'pw/git-p4-tests'
X-Git-Tag: v1.7.12-rc0~51
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=faae8854bfb18da013e0a41d061dbbe73b3c9c73;p=git.git

Merge branch 'pw/git-p4-tests'

More "git p4" tests.

* pw/git-p4-tests:
  git p4 test: fix badp4dir test
  git p4 test: split up big t9800 test
  git p4 test: cleanup_git should make a new $git
  git p4 test: copy source indeterminate
  git p4 test: check for error message in failed test
  git p4 test: rename some "git-p4 command" strings
  git p4 test: never create default test repo
  git p4 test: simplify quoting involving TRASH_DIRECTORY
  git p4 test: use real_path to resolve p4 client symlinks
  git p4 test: wait longer for p4d to start and test its pid
---

faae8854bfb18da013e0a41d061dbbe73b3c9c73
diff --cc t/t9810-git-p4-rcs.sh
index b00ad09d2,d8bb3d06d..e9daa9c4f
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@@ -244,9 -244,9 +244,9 @@@ test_expect_success 'cope with rcs keyw
  		cd "$git" &&
  		git config git-p4.skipSubmitEdit true &&
  		git config git-p4.attemptRCSCleanup true &&
- 		(cd ../cli && p4_append_to_file kwfile1.c) &&
+ 		(cd "$cli" && p4_append_to_file kwfile1.c) &&
  		old_lines=$(wc -l <kwfile1.c) &&
 -		perl -n -i -e "print unless m/Revision:/" kwfile1.c &&
 +		"$PERL_PATH" -n -i -e "print unless m/Revision:/" kwfile1.c &&
  		new_lines=$(wc -l <kwfile1.c) &&
  		test $new_lines = $(($old_lines - 1)) &&