[acceptance-tests] Fix tarball build and rename "check" target to "check-full"

The acceptance-tests folder wasn't getting included in the tarball, adding the folder
to the SUBDIRS in the top-level Makefile.am fixes this. Additionally, EXTRA_DISTFILES
doesn't work outside of mcs/ so rename it to EXTRA_DIST.

Since we don't want a top-level "make check" to recurse into acceptance-tests just yet,
rename the check target to check-full so nothing gets run by default.

diff --git a/Makefile.am b/Makefile.am
index 330f8d00ce53851b060fc3b2128614ab3a2ee634..14232e66858e4039714eb065b4db8ecf08f5461c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,15 +5,15 @@ AM_CFLAGS = $(WERROR_CFLAGS)
 MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
 
 if CROSS_COMPILING
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
 else
-SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
+SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir) acceptance-tests
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
+DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
 endif
 
 all: update_submodules

diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index 4e75d485aaca2be2e4dc5a3882184c945e6f3beb..8642c2b896bd12bfaa47a5950087e7f8d87483e7 100644 (file)
--- a/acceptance-tests/Makefile.am
+++ b/acceptance-tests/Makefile.am
@@ -5,9 +5,9 @@ MSTESTSUITE_PATH=$(TOP)/../ms-test-suite
 
 include versions.mk
 
-EXTRA_DISTFILES=README.md SUBMODULES.json versions.mk versions.py
+EXTRA_DIST=README.md SUBMODULES.json versions.mk versions.py
 
-check: check-roslyn check-coreclr check-ms-test-suite
+check-full: check-roslyn check-coreclr check-ms-test-suite
 
 CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
 

diff --git a/acceptance-tests/README.md b/acceptance-tests/README.md
index 5a25caebd7c3f5df64e65bd0297c81e0f405e7e9..3ca8102a2284c01814a42265c6876c4d8bf2669d 100644 (file)
--- a/acceptance-tests/README.md
+++ b/acceptance-tests/README.md
@@ -1,4 +1,4 @@
-This directory contains acceptance tests, handled by optional non git submodule based submodules. Run the tests via "make check".
+This directory contains acceptance tests, handled by optional non git submodule based submodules. Run the tests via "make check-full" (there are also targets for individual test suites).
 
 The SUBMODULES.json file stores information about the submodules, and make targets are used to check out submodules, check their versions, and update the submodule information.