Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Urban <bernhard.urban@xamarin.com>2017-10-31 15:09:14 +0300
committerBernhard Urban <bernhard.urban@xamarin.com>2017-11-06 17:50:32 +0300
commit30fd079c90b6a44a2e8bb9b35b414a06998ccc77 (patch)
tree62251cd368575447091f681ffe7c2e119d0b47f1 /mcs/class/System.Web
parent879f4bc60ff355147eb278d9a46a240da4103bb4 (diff)
[mcs make] introduce TEST_RUNTIME_FLAGS, analogously to TEST_RUNTIME vs. RUNTIME
Diffstat (limited to 'mcs/class/System.Web')
-rw-r--r--mcs/class/System.Web/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index a7e12930f15..495c1ea6b03 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -357,7 +357,7 @@ STANDALONE_TEST_RUNNER = Test/tools/standalone-runner.exe
ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
RUN_STANDALONE = MONO_TESTS_IN_PROGRESS=yes
endif
-RUN_STANDALONE += $(TEST_RUNTIME) $(STANDALONE_TEST_RUNNER) --output=StandaloneTestResult-$(PROFILE).log
+RUN_STANDALONE += $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(STANDALONE_TEST_RUNNER) --output=StandaloneTestResult-$(PROFILE).log
ifdef TESTNAME
RUN_STANDALONE += --test=$(TESTNAME)
endif
@@ -374,13 +374,13 @@ System.Web/UplevelHelper.cs: UplevelHelperDefinitions.xml
MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/culevel.exe -o $@ $^
run-aaa: test
- $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
+ $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
/output:TestResult-$(PROFILE).log /include:aaa /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
(echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
$$ok
run-nunitweb: test
- $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
+ $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
/output:TestResult-$(PROFILE).log /include:NunitWeb /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
(echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
$$ok