New tests.

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

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 77169a4c1460682fb52af4f5879d1b4d1f76e16e..f4a69906008d8bcc3dc5642bfd610d69c6ea04da 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -74,6 +74,16 @@ RESOURCE_FILES_2 = \
        System.Web.UI.WebControls/Menu.js
 
 OTHER_RES = $(RESOURCE_FILES_1)
+TEST_APP_CODE_FILES = \
+       Test/mainsoft/NunitWebResources/App_Code/EnumConverterControl.cs \
+       Test/mainsoft/NunitWebResources/App_Code/MyContainer.cs \
+       Test/mainsoft/NunitWebResources/App_Code/CustomCheckBoxColumn.cs
+
+TEST_APP_GLOBALRESOURCES_FILES = \
+       Test/mainsoft/NunitWebResources/App_GlobalResources/Common.resx \
+       Test/mainsoft/NunitWebResources/App_GlobalResources/Common.fr-FR.resx \
+       Test/mainsoft/NunitWebResources/App_GlobalResources/Resource1.resx
+
 TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx \
@@ -93,8 +103,6 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap \
        Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap \
-       Test/mainsoft/NunitWebResources/App_GlobalResources/Common.resx \
-       Test/mainsoft/NunitWebResources/App_GlobalResources/Common.fr-FR.resx \
        Test/mainsoft/NunitWebResources/menuclass.aspx \
        Test/mainsoft/NunitWebResources/FormView.aspx \
        Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
@@ -197,7 +205,25 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/NestedParserFileText.aspx \
        Test/mainsoft/NunitWebResources/StateFormatter_CorrectConverter.aspx \
        Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx \
-       Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx.cs
+       Test/mainsoft/NunitWebResources/StateFormatter_CollectionConverter.aspx.cs \
+       Test/mainsoft/NunitWebResources/ChangePasswordContainer_FindControl.aspx \
+       Test/mainsoft/NunitWebResources/TagWithExpressionWithinAttribute.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_1.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxList_Bug377703_2.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxList_Bug578770.aspx \
+       Test/mainsoft/NunitWebResources/EnumConverter_Bug578586.aspx \
+       Test/mainsoft/NunitWebResources/ButtonColor_Bug325489.aspx \
+       Test/mainsoft/NunitWebResources/SqlDataSource_OnInit_Bug572781.aspx \
+       Test/mainsoft/NunitWebResources/FormViewPagerVisibility.aspx \
+       Test/mainsoft/NunitWebResources/OverridenControlsPropertyAndPostBack_Bug594238.aspx \
+       Test/mainsoft/NunitWebResources/GlobalizationEncodingName.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_0.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_1.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_2.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_5.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_6.aspx \
+       Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_7.aspx \
+       Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx
 
 RESX_DIST =  resources/TranslationResources.resx
 ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
@@ -205,6 +231,9 @@ RESX_RES = $(RESX_DIST:.resx=.resources)
 endif
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
+NUNIT_APP_CODE_FILES = $(TEST_APP_CODE_FILES)
+NUNIT_APP_GLOBALRESOURCES_FILES = $(TEST_APP_GLOBALRESOURCES_FILES)
+
 ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
 OTHER_RES += $(RESOURCE_FILES_2)
 OTHER_LIB_MCS_FLAGS = -d:INSIDE_SYSTEM_WEB -nowarn:618 -r:System.Configuration.dll -r:Mono.Data.Sqlite.dll
@@ -242,7 +271,11 @@ echo-warning-systemcore:
 endif
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 -r:SystemWebTestShim.dll \
+       $(NUNIT_RESOURCE_FILES:%=/resource:%) \
+       $(foreach file,$(NUNIT_APP_CODE_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_Code/\2 ;g')) \
+       $(foreach file,$(NUNIT_APP_GLOBALRESOURCES_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_GlobalResources/\2 ;g'))
+
 ifeq (net_2_0, $(PROFILE))
 TEST_MCS_FLAGS += -r:System.Web.Extensions.dll
 endif
@@ -251,15 +284,18 @@ EXTRA_DISTFILES = \
        $(RESOURCE_FILES_2) \
        $(RESOURCE_FILES_1) \
        $(TEST_RESOURCE_FILES) \
+       $(TEST_APP_CODE_FILES) \
+       $(TEST_APP_GLOBALRESOURCES_FILES) \
        UplevelHelperDefinitions.xml \
        $(RESX_DIST) \
        SQLiteProviders_DatabaseSchema.sql \
        $(shell find Test/standalone-runner-support/ -name "*.cs" -type f -printf "'%p' ") \
        $(shell find Test/standalone-tests/ -name "*.cs" -type f -printf "'%p' " -o -name "*.cs.in" -type f -printf "'%p' ") \
-       $(shell find Test/standalone/ -type f -printf "'%p' ") \
-       $(shell find Test/tools/ -type f -printf "'%p' ") \
+       $(shell find Test/standalone/ -path '*/.svn' -prune -o -type f -printf "'%p' ") \
+       $(shell find Test/tools/ -path '*/.svn' -prune -o -type f -printf "'%p' ") \
        System.Web_standalone_test.dll.sources \
-       standalone-runner-support.dll.sources
+       standalone-runner-support.dll.sources \
+       ASPState.sql
 
 BUILT_SOURCES = System.Web/UplevelHelper.cs 
 
@@ -302,11 +338,11 @@ endif
 
 CLASSLIB_DIR = $(topdir)/class/lib/$(PROFILE)
 
-STANDALONE_RUNNER_SUPPORT_MCS_FLAGS = -d:STANDALONE_TEST -debug:full -r:System.Web.dll -r:nunit.framework.dll
+STANDALONE_RUNNER_SUPPORT_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -d:STANDALONE_TEST -debug:full -r:System.Web.dll -r:nunit.framework.dll
 STANDALONE_RUNNER_SUPPORT_ASSEMBLY = $(CLASSLIB_DIR)/standalone-runner-support.dll
 STANDALONE_RUNNER_SUPPORT_MAKEFRAG = $(depsdir)/$(PROFILE)_standalone-runner-support.dll.makefrag
 
-STANDALONE_TEST_MCS_FLAGS = -debug:full -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:System.Web.dll -r:nunit.framework.dll
+STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -debug:full -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:System.Web.dll -r:nunit.framework.dll
 STANDALONE_TEST_ASSEMBLY = System.Web_standalone_test_$(PROFILE).dll
 STANDALONE_TEST_MAKEFRAG = $(depsdir)/$(STANDALONE_TEST_ASSEMBLY).makefrag