X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FMakefile;h=54e668b15e6679e035f1b013033b09c50f1e904b;hb=08e94fae98bc90ac054eab881c4966f4e866ee6a;hp=245e1edabb7f33b07637295ea18bad5626ee8c25;hpb=987f8c63e214937c50dcb308149f7558a2cbba41;p=mono.git diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile index 245e1edabb7..54e668b15e6 100644 --- a/mcs/class/System.Web/Makefile +++ b/mcs/class/System.Web/Makefile @@ -57,10 +57,8 @@ RESOURCE_FILES_2 = \ resources/TreeView_tminus.gif \ resources/TreeView_tplus.gif \ resources/transparent.gif \ - resources/callback.js \ resources/webform.js \ resources/WebUIValidation_2.0.js \ - resources/MaintainScrollPositionOnPostBack.js \ System.Web.UI.WebControls/GridView.js \ System.Web.UI.WebControls/DetailsView.js \ System.Web.UI.WebControls/TreeView.js \ @@ -68,6 +66,9 @@ RESOURCE_FILES_2 = \ OTHER_RES = $(RESOURCE_FILES_1) TEST_RESOURCE_FILES = \ + Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax \ + Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs \ + Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx \ Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master \ Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx \ Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \ @@ -82,18 +83,21 @@ TEST_RESOURCE_FILES = \ Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx \ Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx \ Test/mainsoft/NunitWebResources/Theme1.skin \ + Test/mainsoft/NunitWebResources/Theme2.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/DataGrid.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/GridViewUpdate.aspx \ Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml \ Test/mainsoft/NunitWebResources/XMLDataSourceTest.xsl \ Test/mainsoft/NunitWebResources/XMLDataSourceTest1.aspx \ @@ -101,6 +105,7 @@ TEST_RESOURCE_FILES = \ Test/mainsoft/NunitWebResources/XMLDataSourceTest3.aspx \ Test/mainsoft/NunitWebResources/XMLDataSourceTest4.aspx \ Test/mainsoft/NunitWebResources/LoginViewTest1.aspx \ + Test/mainsoft/NunitWebResources/WebControl.config \ Test/mainsoft/NunitWebResources/WebLogin.config \ Test/mainsoft/NunitWebResources/CallbackTest1.aspx \ Test/mainsoft/NunitWebResources/CallbackTest2.aspx \ @@ -120,6 +125,12 @@ TEST_RESOURCE_FILES = \ Test/mainsoft/NunitWebResources/MasterTypeTest2.aspx \ Test/mainsoft/NunitWebResources/PageLifecycleTest.aspx \ Test/mainsoft/NunitWebResources/PageValidationTest.aspx \ + Test/mainsoft/NunitWebResources/AsyncPage.aspx \ + Test/mainsoft/NunitWebResources/PageCultureTest.aspx \ + Test/mainsoft/NunitWebResources/adapters.browser \ + Test/mainsoft/NunitWebResources/NoEventValidation.aspx \ + Test/mainsoft/NunitWebResources/ListControlPage.aspx \ + Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx \ Test/mainsoft/MainsoftWebTest/nunitweb_config.xml NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES) @@ -166,14 +177,14 @@ 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 + (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 + (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \ + $$ok run-nunitweb-ondotnet: test $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \