2004-01-01 Nick Drochak <ndrochak@gol.com>

[mono.git] / mcs / tests / Makefile

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index c4079ad340164384cd4d066afbbde5110dd2cb4d..6064dbfea356bda3a66796c71907a77e2837f78f 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -15,32 +15,33 @@ USE_MCS_FLAGS :=
 TEST_SOURCES = \
        test-1   test-2   test-3   test-4   test-5   test-6   test-7   test-8   test-9   test-10 \
        test-11  test-12  test-13  test-14  test-15  test-16  test-17  test-18  test-19  test-20 \
-       test-21  test-22  test-23  test-24  test-25  test-26  test-27           test-29  test-30 \
+       test-21  test-22  test-23  test-24  test-25  test-26  test-27  test-28  test-29  test-30 \
        test-31  test-32  test-33  test-34  test-35  test-36  test-37  test-38  test-39  test-40 \
-       test-41  test-42  test-43  test-44           test-46  test-47  test-48  test-49  \
-       test-51  test-52           test-54  test-55  test-56  test-57           test-59  test-60 \
+       test-41  test-42  test-43  test-44  test-45  test-46  test-47  test-48  test-49  \
+       test-51  test-52  test-53  test-54  test-55  test-56  test-57           test-59  test-60 \
        test-61  test-62  test-63  test-64  test-65  test-66           test-68  test-69  test-70 \
        test-71  test-72  test-73  test-74  test-75  test-76  test-77  test-78  test-79  test-80 \
        test-81  test-82  test-83  test-84  test-85  test-86  test-87  test-88  test-89  test-90 \
-                test-92  test-93  test-94  test-95  test-96  test-97  test-98  test-99  test-100\
-       test-101          test-103 test-104 test-105                   test-108 test-109 test-110\
+       test-91  test-92  test-93  test-94  test-95  test-96  test-97  test-98  test-99  test-100\
+       test-101 test-102 test-103 test-104 test-105 test-106 test-107 test-108 test-109 test-110\
        test-111 test-112 test-113 test-114 test-115 test-116 test-117 test-118 test-119 \
-       test-121          test-123          test-125 test-126 test-127 test-128 test-129 test-130 \
+       test-121 test-122 test-123          test-125 test-126 test-127 test-128 test-129 test-130 \
        test-131                   test-134 test-135 test-136 test-137 test-138 test-139 test-140 \
        test-141 test-142 test-143 test-144 test-145 test-146 test-147 test-148 test-149 test-150 \
-                         test-153 test-154 test-155 test-156 test-157 test-158 test-159 test-160 \
+       test-151 test-152 test-153 test-154 test-155 test-156 test-157 test-158 test-159 test-160 \
        test-161 test-162 test-163 test-164 test-165 test-166 test-167 test-168 test-169 test-170 \
                 test-172 test-173 test-174 test-175 test-176 test-177 test-178 test-179 test-180 \
        test-181 test-182 test-183 test-184 test-185 test-186 test-187 test-188 test-189 test-190 \
        test-191 test-192 test-193 test-194 test-195 test-196 test-197 test-198 test-199 test-200 \
        test-201 test-202 test-203 test-204 test-205 test-206 test-207 test-208 test-209 test-210 \
-       test-211 test-212 test-213 test-214 test-215
+       test-211 test-212 test-213 test-214 test-215 test-216 test-217 test-218 test-219 test-220 \
+       test-221
 
 #
 # C# 2.0 tests 
 #
 TEST2_SOURCES = \
-       2test-1 2test-2 2test-3
+       2test-1 2test-2 2test-3 2test-4
 
 UNSAFE_SOURCES = \
        unsafe-1 unsafe-2 unsafe-3 test-58 test-171 unsafe-5 unsafe-6
@@ -54,7 +55,7 @@ WINDOWS_SOURCES = \
 TEST_NOPASS = \
        test-28  test-45  test-53  test-91  test-102 test-106 test-107 test-120 test-122 test-132 test-133 test-66 test-177
 
-all-local install-local:
+all-local install-local uninstall-local:
 
 # casts
 
@@ -87,7 +88,7 @@ test-local:
 run-test-local: test-compiler-jit test-unsafe-compiler-jit test-casts
 
 clean-local:
-       rm -f *.exe *.out *.pdb casts.cs
+       rm -f *.exe *.netmodule *.out *.pdb casts.cs
 
 dist-local: dist-default
        rm -f $(distdir)/casts.cs
@@ -157,6 +158,8 @@ multi-1:
 #
 # Tests that the order for internal/public in external 
 # assemblies does not affect the outcome of a build.
+# also checks that multiple `entry points' can be declared
+# in a library. (eg, that it is not confused by two Main methods)
 #
 multi-2:
        $(INTERNAL_MCS) /target:library pi.cs
@@ -168,3 +171,9 @@ multi-3:
        $(INTERNAL_MCS) /target:library conv-lib.cs
        $(INTERNAL_MCS) /r:conv-lib.dll conv-main.cs
        $(TEST_RUNTIME) conv-main.exe
+
+multi-4:
+       $(INTERNAL_MCS) /target:module module-1.cs
+       $(INTERNAL_MCS) /target:module module-2.cs
+       $(INTERNAL_MCS) /addmodule:module-1.netmodule /addmodule:module-2.netmodule module-3.cs
+       $(TEST_RUNTIME) module-3.exe