Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8188090: Running tests from make causes spurious mercurial changes
authormcimadamore
Thu, 28 Sep 2017 11:20:16 +0100
changeset 47285 7513299d1cd0
parent 47284 355349babaf4
child 47286 cd02250e9370
8188090: Running tests from make causes spurious mercurial changes Summary: Fix relative path in test/TestCommon.gmk Reviewed-by: erikj
test/TestCommon.gmk file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox