Re: [PATCH] diff: "S_IFREG | 0644" to "(S_IFREG | 0644)" to avoid warning
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Ævar Arnfjörð Bjarmason wrote:
But tests on NetBSD with /bin/sh still fail since we use cd -P, but we
have unapplied patches for that so I didn't pursue it:
http://article.gmane.org/gmane.comp.version-control.git/136561/match=
http://article.gmane.org/gmane.comp.version-control.git/136562/match=Aren't these v1.7.0-rc0~76^2 and v1.7.0-rc0~76^2^? Here's a patch for the more important of the remaining problems. I'm just guessing here; untested, of course. -- 8< -- Subject: tests: use pwd -P to simulate cd -P for portability NetBSD supports pwd -P but not cd -P. POSIX has required both for a while, so this should not be an issue for most Unix-like platforms. The test harness uses cd -P to ensure $PWD and $(pwd) agree; cd $(pwd -P) should do that, too. If pwd -P fails on some platform, with this patch, the test harness will die with 'FATAL: Unexpected exit with code 1'. Signed-off-by: Jonathan Nieder <redacted> --- t/test-lib.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 830e5e7..184bf84 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh@@ -916,9 +916,10 @@ rm -fr "$test" || { } test_create_repo "$test" -# Use -P to resolve symlinks in our working directory so that the cwd -# in subprocesses like git equals our $PWD (for pathname comparisons). -cd -P "$test" || exit 1 +cd "$test" || exit 1 +# Resolve symlinks in our working directory so that the cwd in +# subprocesses like git equals our $PWD (for pathname comparisons). +dir=$(pwd -P) && cd "$dir" || exit 1 HOME=$(pwd) export HOME
--
1.7.2.3