2004-12-09 Marek Safar <marek.safar@seznam.cz>

[mono.git] / mcs / tests / Makefile

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 53bbc05d4e6e384bda2ad09a3f48d64fdac0b6bf..81451ac315ddf5a7a8b47ac5846a36970d949efd 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -27,7 +27,7 @@ USE_MCS_FLAGS :=
 # Martin Baulig will manually move them into TEST_SOURCES_common after merging the code into GMCS.
 # He may also move some to TEST_EXCLUDE_net_2_0 if some of the merges are inappropriate for GMCS.
 #
-NEW_TEST_SOURCES_common = xml-033
+NEW_TEST_SOURCES_common = xml-033 test-329
 
 #
 # Please do _not_ add any tests here - all new tests should go into NEW_TEST_SOURCES_common
@@ -111,7 +111,7 @@ TEST_SOURCES_net_2_0 = \
        gen-81  gen-82  gen-83  gen-84  gen-85  gen-86  gen-87  gen-88  gen-89  gen-90  \
        gen-91  gen-92  gen-93  gen-94  gen-95  gen-96  gen-97                  gen-100 \
        gen-101 gen-102 gen-103 gen-104 gen-105 gen-106 gen-107 gen-108 gen-109 gen-110 \
-       gen-111 gen-112 gen-113 gen-114 gen-115 gen-116
+       gen-111 gen-112 gen-113 gen-114 gen-115 gen-116 gen-117 gen-118 gen-119
 
 TEST_EXCLUDES_net_2_0 = $(NEW_TEST_SOURCES_common)
 
@@ -131,6 +131,11 @@ TEST_ORDERING = \
        pu-pi:pi pu-pi:pp \
        pu-ip:pi pu-ip:pp
 
+# Some tests may require additional files to be available in the current directory.
+# To promote interoperability, we prefer that those files not be referred to with ../ or ..\\
+# To that end, we will copy those files to the test-harness directory, so that we can refer to simple filenames.
+TEST_HARNESS_EXTRAS = $(wildcard *.inc)
+
 all-local install-local uninstall-local:
 
 # casts
@@ -199,6 +204,7 @@ test-harness-run:
        @sed 's,@thisdir@,$(thisdir)/dir-$(TEST_TAG),' harness.mk > dir-$(TEST_TAG)/Makefile
        @test -z '$(exe_tests)' || for i in ''$(exe_tests); do echo $$i | sed 's,\(.*\)-exe$$,\1-exe.res: \1-dll.res,' >> dir-$(TEST_TAG)/Makefile; done
        @test -z '$(TEST_ORDERING)' || for i in ''$(TEST_ORDERING); do echo $$i.res | sed 's,:,.res: ,' >> dir-$(TEST_TAG)/Makefile; done
+       @test -z '$(TEST_HARNESS_EXTRAS)' || cp -p $(TEST_HARNESS_EXTRAS) dir-$(TEST_TAG)/
        @echo 'Running $(TEST_TAG) tests with flags "$(TEST_RUNTIME)" ... '
        @if test -z '$(TEST_SOURCES)'; then :; else \
          cd dir-$(TEST_TAG) ; \
@@ -220,7 +226,7 @@ ilasm:
 TEST_SOURCES_XML = \
        xml-001 xml-002 xml-003 xml-004 xml-005 xml-006 xml-007 xml-008 xml-009 xml-010 \
        xml-011 xml-012 xml-013 xml-014 xml-015 xml-016 xml-017 xml-018 xml-019 xml-020 \
-       xml-021 xml-022 xml-023 xml-024 xml-025 xml-026 xml-028 xml-029 xml-030 \
+       xml-021         xml-023 xml-024 xml-025 xml-026                 xml-029 xml-030 \
        xml-031 xml-032
 
 # currently no formalization on 'cref' attribute was found, so there are some