diff options
author | Marek Safar <marek.safar@gmail.com> | 2009-09-30 18:53:50 +0400 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2009-09-30 18:53:50 +0400 |
commit | fda979b402ee133bccbfb49b0dc2e4a2bc276fae (patch) | |
tree | 9b6ec0b65812c0428120df6b59c0050ccb260e48 /mcs/tests/Makefile | |
parent | 616f0027ff47231341fcaf9f8d86002d9a5b7ba6 (diff) |
Removed 1.1 and fixed 4.0 profile
svn path=/trunk/mcs/; revision=143018
Diffstat (limited to 'mcs/tests/Makefile')
-rw-r--r-- | mcs/tests/Makefile | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile index 503b0d348ca..d08045a7856 100644 --- a/mcs/tests/Makefile +++ b/mcs/tests/Makefile @@ -11,13 +11,8 @@ DISTFILES += $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) $(wildcard *.in with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" -ifeq (net_1_1, $(PROFILE)) -# force this, we don't case if CSC is broken. This also -# means we can use --options, yay. -MCS = $(with_mono_path) $(INTERNAL_MCS) -endif -ilasm = $(topdir)/class/lib/net_1_1_bootstrap/ilasm.exe -ILASM = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm) +ilasm = $(topdir)/class/lib/$(PROFILE)/ilasm.exe +ILASM = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm) ifeq (net_2_0, $(PROFILE)) 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 @@ -28,7 +23,7 @@ USE_MCS_FLAGS := # mention all targets all-local $(STD_TARGETS:=-local): -VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_2_1 net_4_0, $(PROFILE)) ifdef VALID_PROFILE # casts bootstrap-cast.exe: gen-cast-test.cs @@ -72,32 +67,23 @@ TEST_PATTERN = 'v2' LOCAL_RUNTIME_FLAGS = --verify-all TOPTIONS += '-il:ver-il-gmcs.xml' endif -ifeq (net_1_1, $(PROFILE)) -COMPILER_NAME = mcs -TEST_PATTERN = 'v1' -LOCAL_RUNTIME_FLAGS = --verify-all -endif COMPILER = $(topdir)/class/lib/$(PROFILE)/$(COMPILER_NAME).exe TESTER = MONO_RUNTIME='$(RUNTIME)' $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(LOCAL_RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe TEST_ILS := $(wildcard *-lib.il) -ifeq (net_2_0, $(PROFILE)) eval-test: $(CSCOMPILE) eval-test.cs -r:$(COMPILER) $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) eval-test.exe -else -eval-test: -endif -check: run-test +check: eval-test + $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TOPTIONS) test-local: @: -run-test-local: $(TEST_ILS:.il=.dll) eval-test - $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TOPTIONS) +run-test-local: $(TEST_ILS:.il=.dll) setup check # Temporary testing targets cecil: @@ -109,12 +95,8 @@ cecil2: $(TESTER) -mode:pos -files:'*test-*.cs' -compiler:gmcs.exe -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log -verbose # End -test-everything: - $(MAKE) PROFILE=net_1_1 run-test - $(MAKE) PROFILE=net_2_0 run-test - -test-generics: - $(MAKE) PROFILE=net_2_0 run-test +#test-everything: +# $(MAKE) PROFILE=net_2_0 run-test clean-local: -rm -fr dir-* @@ -129,16 +111,13 @@ dist-local: dist-default %-lib.dll: %-lib.il $(ILASM) /dll /out:$@ $< - -ifeq (net_1_1, $(PROFILE)) -run-test-local: ilasm -ilasm: + +setup: $(ILASM) /dll property-il.il $(CSCOMPILE) /r:property-il.dll property-main.cs /out:property-main.exe $(TEST_RUNTIME) property-main.exe $(CSCOMPILE) -t:library dlls/test-679-2/test-679-lib-2.cs $(CSCOMPILE) -t:library dlls/test-679-1/test-679-lib.cs -r:dlls/test-679-2/test-679-lib-2.dll -endif - + endif |