X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FMakefile;h=f4a69906008d8bcc3dc5642bfd610d69c6ea04da;hb=2d23bfcbce7a3f7e54dcd5911adb88b244baca35;hp=8b52a16da5e8a932fcdb34f35da41f3a57041d2c;hpb=9e1f34dd2d7be45b2a3a6b1c133a4a1de8c3d864;p=mono.git

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 8b52a16da5e..f4a69906008 100644
--- 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,10 +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/App_GlobalResources/Resource1.resx \
-	Test/mainsoft/NunitWebResources/App_Code/EnumConverterControl.cs \
 	Test/mainsoft/NunitWebResources/menuclass.aspx \
 	Test/mainsoft/NunitWebResources/FormView.aspx \
 	Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
@@ -207,7 +213,17 @@ TEST_RESOURCE_FILES = \
 	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/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))
@@ -215,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
@@ -252,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
@@ -261,13 +284,15 @@ 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/ -not -name .svn -prune -o -printf "'%p' ") \
-	$(shell find Test/tools/ -not -name .svn -prune -o -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 \
 	ASPState.sql