Skip to content

Commit 4063bef

Browse files
committedMar 9, 2016
[acceptance-tests] Move git "submodules" to acceptance-tests/external instead of next to Mono repo
A few people told me it's surprising that acceptance-tests checks out repos into <mono repo>/../ and it can cause unwanted changes when a repo with the same name already exists there. While this structure is used in several internal repos I agree for Mono it's better to keep everything inside the repo itself.
1 parent 5a33ae7 commit 4063bef

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed
 

‎acceptance-tests/Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
TOP=..
2-
ROSLYN_PATH=$(TOP)/../roslyn
3-
CORECLR_PATH=$(TOP)/../coreclr
4-
MSTESTSUITE_PATH=$(TOP)/../ms-test-suite
1+
ACCEPTANCE_TESTS_PATH=external
2+
ROSLYN_PATH=$(ACCEPTANCE_TESTS_PATH)/roslyn
3+
CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
4+
MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
55

66
include versions.mk
77

‎acceptance-tests/external/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

‎acceptance-tests/versions.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ __bump-branch-%:
118118
@if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(CONFIG); fi
119119

120120
__bump-current-version-%:
121-
REV=$(shell cd $(TOP)/../$* && git log -1 --pretty=format:%H); \
121+
REV=$(shell cd $(ACCEPTANCE_TESTS_PATH)/$* && git log -1 --pretty=format:%H); \
122122
python versions.py set-rev $* $$REV; \
123123
if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to pick up $$REV:" | git commit -F - $(CONFIG); fi
124124

0 commit comments

Comments
 (0)
Please sign in to comment.