diff options
author | Marek Safar <marek.safar@gmail.com> | 2016-04-05 17:34:53 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2016-11-28 10:56:04 +0300 |
commit | 3891a8907626f741037ec76a282c4a89c65aef46 (patch) | |
tree | ddf636fcec4501dec476dffb5a1c33628a3287ce /acceptance-tests | |
parent | 700a511bac54d497c75036c40f800c7ebfe211d6 (diff) |
[build] Roslyn switch
Diffstat (limited to 'acceptance-tests')
-rw-r--r-- | acceptance-tests/Makefile.am | 2 | ||||
-rw-r--r-- | acceptance-tests/ms-test-suite.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index c03adcc0c45..6f4f2080ebf 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -11,7 +11,7 @@ CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE) with_mono_path = MONO_PATH=$(CLASS) RUNTIME = $(with_mono_path) $(abs_top_builddir)/runtime/mono-wrapper --debug -MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe +MCS = $(RUNTIME) $(CSC) -nologo ILASM = $(RUNTIME) $(CLASS)/ilasm.exe include versions.mk diff --git a/acceptance-tests/ms-test-suite.mk b/acceptance-tests/ms-test-suite.mk index 1516dc61db6..7ed072e797d 100644 --- a/acceptance-tests/ms-test-suite.mk +++ b/acceptance-tests/ms-test-suite.mk @@ -1,8 +1,8 @@ check-ms-test-suite: $(CLASS)/nunitlite.dll @if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \ - $(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \ + $(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \ $(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml" || EXIT_CODE=1; \ - $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug -warn:1" && \ + $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug:portable -warn:1" && \ $(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run MONO="$(RUNTIME)" || EXIT_CODE=1; \ exit $$EXIT_CODE; \ else \ |