projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[asp.net] Do nothing if null SessionStateStoreData is passed to SessionStateServerHan...
[mono.git]
/
mcs
/
class
/
System.Web
/
Makefile
diff --git
a/mcs/class/System.Web/Makefile
b/mcs/class/System.Web/Makefile
index cec2f088facd284aee081d9c7ce18c390fc7d5b2..7f1691c32fceb94a78fc27c967166545e286eaae 100644
(file)
--- a/
mcs/class/System.Web/Makefile
+++ b/
mcs/class/System.Web/Makefile
@@
-396,7
+396,10
@@
STANDALONE_TEST_COMPILABLE_TESTS = \
endif
STANDALONE_TEST_RUNNER = Test/tools/standalone-runner.exe
endif
STANDALONE_TEST_RUNNER = Test/tools/standalone-runner.exe
-RUN_STANDALONE = $(TEST_RUNTIME) $(STANDALONE_TEST_RUNNER) --output=StandaloneTestResult-$(PROFILE).log
+ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
+RUN_STANDALONE = MONO_TESTS_IN_PROGRESS=yes
+endif
+RUN_STANDALONE += $(TEST_RUNTIME) $(STANDALONE_TEST_RUNNER) --output=StandaloneTestResult-$(PROFILE).log
ifdef TESTNAME
RUN_STANDALONE += --test=$(TESTNAME)
endif
ifdef TESTNAME
RUN_STANDALONE += --test=$(TESTNAME)
endif
@@
-410,7
+413,7
@@
$(RESX_RES): %.resources: %.resx
$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
System.Web/UplevelHelper.cs: UplevelHelperDefinitions.xml
$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
System.Web/UplevelHelper.cs: UplevelHelperDefinitions.xml
-
$(TEST_RUNTIME
) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/culevel.exe -o $@ $^
+
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) \
run-aaa: test
$(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \