changeset 47297:7513299d1cd0

8188090: Running tests from make causes spurious mercurial changes Summary: Fix relative path in test/TestCommon.gmk Reviewed-by: erikj
author mcimadamore
date Thu, 28 Sep 2017 11:20:16 +0100
parents 355349babaf4
children cd02250e9370
files test/TestCommon.gmk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/TestCommon.gmk	Wed Sep 27 16:47:07 2017 -0700
+++ b/test/TestCommon.gmk	Thu Sep 28 11:20:16 2017 +0100
@@ -273,7 +273,7 @@
 prep:
 	@$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
 	@$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)`
-	@if [ ! -d $(TEST_ROOT)/../.hg ] ; then                                   \
+	@if [ ! -d $(TEST_ROOT)/../../.hg ] && [ ! -d $(TEST_ROOT)/../../../.hg ]; then  \
 	  $(FIND) $(TEST_ROOT) \( -name \*.dll -o -name \*.DLL -o -name \*.so \)  \
 	        -exec $(CHMOD) a+rx {} \; ;                                       \
 	fi