Author: raja
Date: 2005-06-27 07:02:54 -0400 (Mon, 27 Jun 2005)
New Revision: 46547
Removed:
trunk/mcs/tests/harness.mk
Modified:
trunk/mcs/tests/ChangeLog
trunk/mcs/tests/Makefile
Log:
* Makefile: Remove old test harness.
* harness.mk: Remove.
Modified: trunk/mcs/tests/ChangeLog
===================================================================
--- trunk/mcs/tests/ChangeLog 2005-06-27 10:25:45 UTC (rev 46546)
+++ trunk/mcs/tests/ChangeLog 2005-06-27 11:02:54 UTC (rev 46547)
@@ -1,3 +1,8 @@
+2005-06-27 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile: Remove old test harness.
+ * harness.mk: Remove.
+
2005-06-21 Martin Baulig <[EMAIL PROTECTED]>
* gtest-077.cs: Removed, we don't need this anymore.
Modified: trunk/mcs/tests/Makefile
===================================================================
--- trunk/mcs/tests/Makefile 2005-06-27 10:25:45 UTC (rev 46546)
+++ trunk/mcs/tests/Makefile 2005-06-27 11:02:54 UTC (rev 46547)
@@ -7,7 +7,7 @@
SUBDIRS =
include ../build/rules.make
-DISTFILES = README.tests harness.mk $(wildcard *.cs) $(wildcard *.il)
$(wildcard *.xml) $(wildcard *.inc)
+DISTFILES = README.tests $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml)
$(wildcard *.inc) $(wildcard known-issues-*)
with_mono_path =
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
@@ -23,148 +23,8 @@
BOOTSTRAP_MCS =
MONO_PATH="$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_2_0_bootstrap/mcs.exe
endif
-# We don't want debugging info :-)
-
USE_MCS_FLAGS :=
-# All new tests for 'mcs' go in here
-# These tests are not run by GMCS since the corresponding code is not yet in
there.-
-# 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 = test-386 test-387 test-388 test-389
-
-#
-# Please do _not_ add any tests here - all new tests should go into
NEW_TEST_SOURCES_common
-# Martin Baulig is the only one who may add tests here - after merging the
latest MCS patches
-# into GMCS
-#
-
-TEST_SOURCES_common = \
- 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-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-45 test-46 test-47 test-48
test-49 test-50 \
- test-51 test-52 test-53 test-54 test-55 test-56 test-57 test-58
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-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-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-120 \
- test-121 test-122 test-123 test-125 test-126 test-127 test-128
test-129 test-130 \
- test-131 test-132 test-133 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-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-171 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-216 test-217 test-218
test-219 test-220 \
- test-221 test-222 test-223 test-224 test-225 test-226 test-227
test-229 test-230 \
- test-231 test-232 test-233 test-234 test-235 test-236 test-237 test-238
test-239 test-240 \
- test-241 test-242 test-243 test-244 test-245 test-246 test-247 test-248
test-249 test-250 \
- test-251 test-252 test-253 test-254 test-255 test-256 test-257 test-258
test-259 test-260 \
- test-261 test-262 test-263 test-264 test-265 test-266 test-267 test-268
test-269 test-270 \
- test-271 test-272 test-273 test-274 test-275 test-276 test-277 test-278
test-279 test-280 \
- test-281 test-282 test-283 test-284 test-285 test-286 test-287 test-288
test-289 test-290 \
- test-291 test-292 test-293 test-294 test-295 test-296 test-297 test-298
test-299 test-300 \
- test-301 test-302 test-303 test-304 test-305 test-306 test-307
test-309 test-310 \
- test-311 test-312 test-313 test-314 test-315 test-316 test-317 test-318
test-320 \
- test-321 test-323 test-324 test-325 test-326 test-327 test-328
test-329 test-330 \
- test-331 test-332 test-333 test-334 test-335 test-336 test-337 test-338
test-339 test-340 \
- test-341 test-342 test-343 test-344 test-345 test-346 test-347 test-348
test-349 test-350 \
- test-351 test-352 test-353 test-354 test-355 test-356 test-357 test-358
test-359 test-360 \
- test-361 test-362 test-363 test-364 test-365 test-366 test-367 test-368
test-369 test-370 \
- test-371 test-372 test-373 test-374 test-375 test-376 test-377 test-378
test-379 test-380 \
- test-381 test-382 test-383 test-384 test-385
\
- cls-test-0 cls-test-1 cls-test-2 cls-test-3 cls-test-5 cls-test-6
cls-test-7 cls-test-10 \
- cls-test-11 cls-test-12 cls-test-14 cls-test-15 cls-test-16 \
- 2test-1 2test-2 2test-3 2test-4 2test-5 2test-6 2test-7 2test-8
2test-9 2test-10 \
- 2test-11 2test-12 2test-13 2test-14 2test-16 2test-17 2test-18
\
- unsafe-1 unsafe-2 unsafe-3 unsafe-5 unsafe-6 unsafe-7 unsafe-8 unsafe-9
unsafe-10 \
- mtest-1-dll mtest-1-exe \
- mtest-2-dll mtest-2-exe \
- mtest-3-dll mtest-3-exe \
- mtest-4-dll mtest-4-exe \
- mtest-5-dll mtest-5-exe \
- mtest-6-dll mtest-6-exe \
- mtest-7-dll mtest-7-exe \
- mtest-8-dll mtest-8-exe \
- test-319-dll test-319-exe \
- covariance-1 covariance-2 covariance-3 \
- conv-dll conv-exe \
- vararg-dll vararg-exe \
- module-1 module-2 module-3 \
- pi pp pu-ip pu-pi \
- a-call a-capture5 a-instance a-parameter2
\
- a-capture10 a-capture6 a-nested-anon2 a-parameter4
\
- a-capture1 a-capture7 a-nested-anon3 a-parameter5
\
- a-capture2 a-capture8 a-nested-anon4
\
- a-capture3 a-capture9 a-nested-anon a-simple2
\
- a-capture4 a-event a-nested a-simple
\
- a-foreach
\
- acc-modifiers acc-modifiers2
\
- $(TEST_SOURCES_XML)
\
- $(NEW_TEST_SOURCES_common)
-
-TEST_EXCLUDES_common = test-50 test-120 a-parameter4
-
-TEST_SOURCES_net_2_0 = \
- gen-13-dll gen-13-exe gen-17-dll gen-17-exe gen-31-dll gen-31-exe
\
- gen-47-dll gen-47-exe gen-98-dll gen-98-exe
\
- gen-156-dll gen-156-exe gen-161-dll gen-161-exe
\
- gen-1 gen-2 gen-3 gen-4 gen-5 gen-6 gen-7 gen-8 gen-9
gen-10 \
- gen-11 gen-12 gen-14 gen-15 gen-16 gen-18 gen-19
gen-20 \
- gen-21 gen-22 gen-23 gen-24 gen-25 gen-26 gen-27 gen-28 gen-29
gen-30 \
- gen-32 gen-33 gen-34 gen-35 gen-36 gen-37 gen-38 gen-39
gen-40 \
- gen-41 gen-42 gen-43 gen-44 gen-45 gen-46 gen-48 gen-49
gen-50 \
- gen-51 gen-52 gen-53 gen-54 gen-55 gen-56 gen-58 gen-59
gen-60 \
- gen-61 gen-62 gen-63 gen-64 gen-66 gen-67 gen-68 gen-69
gen-70 \
- gen-71 gen-72 gen-73 gen-74 gen-75 gen-76 gen-77 gen-78 gen-79
gen-80 \
- 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-117 gen-118 gen-119
gen-120 \
- gen-121 gen-122 gen-123 gen-124 gen-125 gen-127 gen-128 gen-129
gen-130 \
- gen-131 gen-132 gen-133 gen-134 gen-135 gen-136 gen-137 gen-138 gen-139
gen-140 \
- gen-141 gen-142 gen-143 gen-144 gen-145 gen-146 gen-147 gen-148 gen-149
gen-150 \
- gen-151 gen-152 gen-153 gen-154 gen-155 gen-157 gen-158 gen-159
gen-160 \
- gen-162
\
- cond-attr fixed-buffer-dll fixed-buffer-exe
\
- 2test-19 2test-20 2test-21 2test-22
-
-TEST_EXCLUDES_net_2_0 = $(NEW_TEST_SOURCES_common)
-
-# These tests load User32.dll and/or Kernel32.dll
-TEST_SOURCES_win32 = test-67
-
-# This test fails on Win32 (even with CSC). This is #71200.
-TEST_EXCLUDES_win32 = test-74
-
-TEST_SOURCES = $(filter-out $(TEST_EXCLUDES_common)
$(TEST_EXCLUDES_$(PROFILE)) $(TEST_EXCLUDES_$(PLATFORM)), \
- $(TEST_SOURCES_common) $(TEST_SOURCES_$(PROFILE))
$(TEST_SOURCES_$(PLATFORM)))
-
-# The test harness supports running the testcases in parallel. However, we
still need to
-# provide test-ordering rules to support multi-file testcases. By default,
any test named
-# 'foo-exe' requires that a test named 'foo-dll' be present, and they're run
in the order: foo-dll, foo-exe
-# Additional test-orderings can be listed below. Note that x:y says that 'x'
should be run _after_ y
-TEST_ORDERING = \
- module-2:module-1 \
- module-3:module-2 \
- 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) \
- test-74.cs test-353-2.cs test-361-2.cs test-388.cs test-389.cs \
- test-377-$(PROFILE)-il.dll
-
all-local install-local uninstall-local:
# casts
@@ -215,9 +75,6 @@
test-generics:
$(MAKE) PROFILE=net_2_0 run-test
-test-generics-2:
- $(MAKE) PROFILE=net_2_0 TEST_SOURCES="$(TEST_SOURCES_net_2_0)"
test-harness
-
clean-local:
-rm -fr dir-*
-rm -f *.exe *.dll *.netmodule *.out *.pdb casts.cs *.log
@@ -226,57 +83,12 @@
dist-local: dist-default
rm -f $(distdir)/casts.cs
-ifeq (net_2_0, $(PROFILE))
-TEST_TAG = gmcs
-else
-TEST_TAG = mcs
-endif
+%-il.dll: %-il.il
+ $(ILASM) /dll $<
-.PHONY: test-harness test-harness-run
-test-harness:
- @$(MAKE) -s test-harness-run
-
-exe_tests := $(filter %-exe, $(TEST_SOURCES))
-
-test-harness-run: $(TEST_HARNESS_EXTRAS)
- @-rm -f $(TEST_TAG).log
- @-rm -fr dir-$(TEST_TAG)
- @mkdir dir-$(TEST_TAG)
- @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) ; \
- $(MAKE) -s $(TEST_SOURCES:=.res) || failed="make " ; \
- for i in ''$(TEST_SOURCES:=.res); do if test -f $$i; then res="$$res
$$i"; else failed="$$failed $$i"; fi; done; \
- test -z '$$res' || cat $$res < /dev/null > ../$(TEST_TAG).log
2>/dev/null ; \
- failed=$$failed`sed -n 's,^FAIL: ,,p' ../$(TEST_TAG).log` ; \
- if test -z "$$failed"; then :; else echo "Failing tests: $$failed";
exit 1; fi; fi
-
ilasm:
ifeq (default, $(PROFILE))
$(ILASM) /dll property-il.il
$(CSCOMPILE) /r:property-il.dll property-main.cs /out:property-main.exe
$(TEST_RUNTIME) property-main.exe
endif
-
-#
-# Test for /doc option; need to compare result documentation files.
-#
-
-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-023 xml-024 xml-025 xml-026 xml-029 xml-030
\
- xml-031 xml-032 xml-033 xml-034 xml-035 xml-036 xml-037 xml-038
-
-# currently no formalization on 'cref' attribute was found, so there are some
-# differences between MS.NET and mono.
-TEST_SOURCES_XML_PENDING = xml-027
-
-xml-doc-tests := $(filter xml-%, $(TEST_SOURCES))
-
-%-il.dll: %-il.il
- $(ILASM) /dll $<
Deleted: trunk/mcs/tests/harness.mk
===================================================================
--- trunk/mcs/tests/harness.mk 2005-06-27 10:25:45 UTC (rev 46546)
+++ trunk/mcs/tests/harness.mk 2005-06-27 11:02:54 UTC (rev 46547)
@@ -1,51 +0,0 @@
-thisdir = @thisdir@
-SUBDIRS =
-include ../../build/rules.make
-
-ifeq (default, $(PROFILE))
-# force this, we don't case if CSC is broken. This also
-# means we can use --options, yay.
-
-MCS =
MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
$(INTERNAL_MCS)
-endif
-
-XMLDOCDIFF = $(TEST_RUNTIME) ../xmldocdiff.exe
-
-all-local $(STD_TARGETS:=-local):
-
-%.res:
- @f=../$*.cs; options=`sed -n 's,^// Compiler options:,,p' $$f | sed
's,PROFILE,$(PROFILE),g'`; \
- case $$options in *-t:library*) ext=dll ;; *-t:module*) ext=netmodule
;; *) ext=exe ;; esac; \
- testlogfile="$*.log" ; \
- echo '*** $(CSCOMPILE)' "$$options -out:$*.$$ext $$f" > $$testlogfile
; \
- if $(CSCOMPILE) $$options -out:$*.$$ext $$f >> $$testlogfile 2>&1 ;
then \
- if test -f $*.exe; then \
- echo '*** $(TEST_RUNTIME) -O=-all ./$*.exe' >> $$testlogfile ; \
- if $(TEST_RUNTIME) -O=-all ./$*.exe >> $$testlogfile 2>&1 ; then \
- if test -f $*.xml; then \
- if $(XMLDOCDIFF) ../$*-ref.xml $*.xml >> $$testlogfile ; then \
- echo "PASS: $*: xml comparison" > $@ ; \
- rm -f $$testlogfile ; \
- else \
- echo "FAIL: $*: xml comparison" > $@ ; \
- fi ; \
- else \
- echo "PASS: $*" > $@ ; \
- rm -f $$testlogfile ; \
- fi ; \
- else \
- echo "Exit code: $$?" >> $$testlogfile ; \
- echo "FAIL: $*" > $@ ; \
- fi ; \
- else \
- echo "PASS: $*: compilation" > $@ ; \
- rm -f $$testlogfile ; \
- fi ; \
- else \
- echo "Exit code: $$?" >> $$testlogfile ; \
- echo "FAIL: $*: compilation" > $@ ; \
- fi ; \
- cat $@; \
- if test ! -f $$testlogfile ; then :; else cat $$testlogfile; fi
-
-# test ordering dependencies will be pasted after this
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
