Merge pull request #409 from Alkarex/patch-1

[mono.git] / mcs / class / System.Web / Makefile

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 438c0e9747e6bccc577bcb0591544b313f163210..e40d43187ad277c5da6b902e3c1339b9f3861207 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -68,6 +68,14 @@ RESOURCE_FILES_2 = \
        resources/transparent.gif \
        resources/webform.js \
        resources/WebUIValidation_2.0.js \
+       resources/ErrorTemplateCommon_Top.html \
+       resources/DefaultErrorTemplate_CustomErrorDefault.html \
+       resources/ErrorTemplateCommon_Bottom.html \
+       resources/DefaultErrorTemplate_StandardPage.html \
+       resources/HtmlizedExceptionPage_Top.html \
+       resources/HtmlizedExceptionPage_FileLongSource.html \
+       resources/HtmlizedExceptionPage_FileShortSource.html \
+       resources/HtmlizedExceptionPage_CompilerOutput.html \
        System.Web.UI.WebControls/GridView.js \
        System.Web.UI.WebControls/DetailsView.js \
        System.Web.UI.WebControls/TreeView.js \
@@ -95,7 +103,7 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config \
-       Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1 \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0 \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap \
@@ -234,7 +242,8 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx \
        Test/mainsoft/NunitWebResources/CheckBoxList_Bug600415.aspx \
        Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx \
-       Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs
+       Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs \
+       Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx
 
 RESX_DIST =  resources/TranslationResources.resx
 ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
@@ -264,6 +273,7 @@ LIB_MCS_FLAGS = \
        -r:System.Data.dll              \
        -r:System.Xml.dll               \
        -r:System.EnterpriseServices.dll \
+       -r:System.Runtime.Serialization.Formatters.Soap \
        $(OTHER_LIB_MCS_FLAGS) \
        $(RESX_RES:%=/resource:%) \
        $(OTHER_RES:%=/resource:%)
@@ -312,6 +322,7 @@ EXTRA_DISTFILES = \
        $(shell find Test/tools/ -path '*/.svn' -prune -o -type f -printf "'%p' ") \
        System.Web_standalone_test.dll.sources \
        standalone-runner-support.dll.sources \
+       $(shell find Test/System.Web.Caching/CacheItemPriorityQueueTestData/ -name "Sequence*.*" -type f -printf "'%p' ") \
        ASPState.sql
 
 BUILT_SOURCES = System.Web/UplevelHelper.cs 
@@ -387,10 +398,16 @@ STANDALONE_TEST_COMPILABLE_TESTS = \
 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 STANDALONE_VERBOSE
+RUN_STANDALONE += --verbose
+endif
 
 $(build_lib): $(RESX_RES) $(RESOURCE_FILES_2) $(RESOURCE_FILES_1)
 
@@ -398,7 +415,7 @@ $(RESX_RES): %.resources: %.resx
        $(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) \