Add new test CallBackTest.cs and 2 new resources for this test CallbackTest1.aspx...

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

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 0f104edd8bc65c073868e28f20a394613cfd9f27..c2ee6241f1fa0502d7165cdc1f5b0bc26bb76ae1 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -56,22 +56,63 @@ RESOURCE_FILES_2 = \
        resources/TreeView_t.gif \
        resources/TreeView_tminus.gif \
        resources/TreeView_tplus.gif \
+       resources/transparent.gif \
        resources/callback.js \
        resources/webform.js \
+       resources/MaintainScrollPositionOnPostBack.js \
        System.Web.UI.WebControls/GridView.js \
        System.Web.UI.WebControls/TreeView.js \
        System.Web.UI.WebControls/Menu.js
 
 OTHER_RES = $(RESOURCE_FILES_1)
+TEST_RESOURCE_FILES = \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
+       Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config \
+       Test/mainsoft/NunitWebResources/menuclass.aspx \
+       Test/mainsoft/NunitWebResources/FormView.aspx \
+       Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
+       Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx \
+       Test/mainsoft/NunitWebResources/PageWithTheme.aspx \
+       Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx \
+       Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx \
+       Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx \
+       Test/mainsoft/NunitWebResources/Theme1.skin \
+       Test/mainsoft/NunitWebResources/UrlProperty.aspx \
+       Test/mainsoft/NunitWebResources/UrlProperty.ascx \
+       Test/mainsoft/NunitWebResources/UrlProperty.ascx.cs \
+       Test/mainsoft/NunitWebResources/Web.sitemap \
+       Test/mainsoft/NunitWebResources/WizardTest.skin \
+       Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx \
+       Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx \
+       Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx \
+       Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx \
+       Test/mainsoft/NunitWebResources/Bluehills.jpg \
+       Test/mainsoft/NunitWebResources/FormViewTest1.aspx \
+       Test/mainsoft/NunitWebResources/FormViewInsertEditDelete.aspx \
+       Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml \
+       Test/mainsoft/NunitWebResources/XMLDataSourceTest.xsl \
+       Test/mainsoft/NunitWebResources/XMLDataSourceTest1.aspx \
+       Test/mainsoft/NunitWebResources/XMLDataSourceTest2.aspx \
+       Test/mainsoft/NunitWebResources/XMLDataSourceTest3.aspx \
+       Test/mainsoft/NunitWebResources/XMLDataSourceTest4.aspx \
+       Test/mainsoft/NunitWebResources/LoginViewTest1.aspx \
+       Test/mainsoft/NunitWebResources/WebLogin.config \
+       Test/mainsoft/NunitWebResources/CallbackTest1.aspx \
+       Test/mainsoft/NunitWebResources/CallbackTest2.aspx \
+       Test/mainsoft/MainsoftWebTest/nunitweb_config.xml 
+
+NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 ifeq (net_2_0, $(PROFILE))
 OTHER_RES += $(RESOURCE_FILES_2)
-OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll -d:CONFIGURATION_2_0
+OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll
 endif
 
-
 LIB_MCS_FLAGS = \
        -unsafe \
-       -nowarn:612,649 \
+       -nowarn:612,618,649     \
        -r:$(corlib)                    \
        -r:System.dll                   \
        -r:System.Drawing.dll           \
@@ -93,9 +134,9 @@ echo-warning:
 endif
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:219 -nowarn:169
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219 -nowarn:169 $(NUNIT_RESOURCE_FILES:%=/resource:%)
 
-EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1)
+EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) $(TEST_RESOURCE_FILES)
 
 include ../../build/library.make
 
@@ -103,3 +144,22 @@ ifdef WEBSERVICES_DEP_FILE
 LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
 $(the_lib): $(WEBSERVICES_DEP_FILE)
 endif
+
+run-aaa: test
+       $(TEST_RUNTIME) $(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) \
+       /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
+
+run-nunitweb-ondotnet: test
+       $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
+       /output:TestResult-ondotnet-$(PROFILE).log /include:NunitWeb /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
+       (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
+       $$ok
+