[acceptance-tests] Move git "submodules" to acceptance-tests/external instead of...

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.

diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index 6d7395a5c564914ec4d4db60a9f0c40a6993d0eb..e439fc93595a8d1de3f662e0ea8b65f2f978b395 100644 (file)
--- a/acceptance-tests/Makefile.am
+++ b/acceptance-tests/Makefile.am
@@ -1,7 +1,7 @@
-TOP=..
-ROSLYN_PATH=$(TOP)/../roslyn
-CORECLR_PATH=$(TOP)/../coreclr
-MSTESTSUITE_PATH=$(TOP)/../ms-test-suite
+ACCEPTANCE_TESTS_PATH=external
+ROSLYN_PATH=$(ACCEPTANCE_TESTS_PATH)/roslyn
+CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
+MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
 
 include versions.mk
 

diff --git a/acceptance-tests/external/.gitignore b/acceptance-tests/external/.gitignore
new file mode 100644 (file)
index 0000000..c96a04f
--- /dev/null
+++ b/acceptance-tests/external/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file

diff --git a/acceptance-tests/versions.mk b/acceptance-tests/versions.mk
index 7864669b9ecb17fd3e9cd8aaf93c19011cad39b6..9cf7d89bbea89f5c5cd3f6fb3067f484fc53eb3c 100644 (file)
--- a/acceptance-tests/versions.mk
+++ b/acceptance-tests/versions.mk
@@ -118,7 +118,7 @@ __bump-branch-%:
        @if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(CONFIG); fi
 
 __bump-current-version-%:
-       REV=$(shell cd $(TOP)/../$* && git log -1 --pretty=format:%H); \
+       REV=$(shell cd $(ACCEPTANCE_TESTS_PATH)/$* && git log -1 --pretty=format:%H); \
        python versions.py set-rev $* $$REV; \
        if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to pick up $$REV:" | git commit -F - $(CONFIG); fi