Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 1274213005: Disable NaCl browser_tests for GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/path_service.h" 5 #include "base/path_service.h"
6 #include "base/test/test_timeouts.h" 6 #include "base/test/test_timeouts.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // Similar macros that test with an SSL server. 52 // Similar macros that test with an SSL server.
53 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \ 53 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_SSL_SERVER(test_name) \
54 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \ 54 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, test_name) { \
55 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \ 55 RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
56 } 56 }
57 57
58 // Disable all NaCl tests for --disable-nacl flag and on Mac ASAN builds. 58 // Disable all NaCl tests for --disable-nacl flag and on Mac ASAN builds.
59 // Flaky on Mac ASAN: 59 // Flaky on Mac ASAN:
60 // http://crbug.com/428670 60 // http://crbug.com/428670
61 61
62 #if defined(DISABLE_NACL) || (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)) 62 #if defined(DISABLE_NACL) || \
63 (defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)) || \
64 defined(DISABLE_NACL_BROWSERTESTS)
63 65
64 #define MAYBE_PPAPI_NACL(test_name) DISABLED_##test_name 66 #define MAYBE_PPAPI_NACL(test_name) DISABLED_##test_name
65 67
66 #define TEST_PPAPI_NACL(test_name) 68 #define TEST_PPAPI_NACL(test_name)
67 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name) 69 #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
68 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) 70 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
69 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement) 71 #define TEST_PPAPI_NACL_SUBTESTS(test_name, run_statement)
70 72
71 #else 73 #else
72 74
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 #define RUN_NETADDRESS_SUBTESTS \ 730 #define RUN_NETADDRESS_SUBTESTS \
729 RunTestViaHTTP( \ 731 RunTestViaHTTP( \
730 LIST_TEST(NetAddress_IPv4Address) \ 732 LIST_TEST(NetAddress_IPv4Address) \
731 LIST_TEST(NetAddress_IPv6Address) \ 733 LIST_TEST(NetAddress_IPv6Address) \
732 LIST_TEST(NetAddress_DescribeAsString) \ 734 LIST_TEST(NetAddress_DescribeAsString) \
733 ) 735 )
734 736
735 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) { 737 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetAddress) {
736 RUN_NETADDRESS_SUBTESTS; 738 RUN_NETADDRESS_SUBTESTS;
737 } 739 }
738 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddress) { 740 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(NetAddress)) {
739 RUN_NETADDRESS_SUBTESTS; 741 RUN_NETADDRESS_SUBTESTS;
740 } 742 }
741 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddress) { 743 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(NetAddress)) {
742 RUN_NETADDRESS_SUBTESTS; 744 RUN_NETADDRESS_SUBTESTS;
743 } 745 }
744 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 746 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
745 MAYBE_PNACL_NONSFI(NetAddress)) { 747 MAYBE_PNACL_NONSFI(NetAddress)) {
746 RUN_NETADDRESS_SUBTESTS; 748 RUN_NETADDRESS_SUBTESTS;
747 } 749 }
748 750
749 // NetAddressPrivate tests. 751 // NetAddressPrivate tests.
750 #define RUN_NETADDRESS_PRIVATE_SUBTESTS \ 752 #define RUN_NETADDRESS_PRIVATE_SUBTESTS \
751 RunTestViaHTTP( \ 753 RunTestViaHTTP( \
(...skipping 18 matching lines...) Expand all
770 LIST_TEST(NetAddressPrivateUntrusted_AreEqual) \ 772 LIST_TEST(NetAddressPrivateUntrusted_AreEqual) \
771 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) \ 773 LIST_TEST(NetAddressPrivateUntrusted_AreHostsEqual) \
772 LIST_TEST(NetAddressPrivateUntrusted_Describe) \ 774 LIST_TEST(NetAddressPrivateUntrusted_Describe) \
773 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) \ 775 LIST_TEST(NetAddressPrivateUntrusted_ReplacePort) \
774 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) \ 776 LIST_TEST(NetAddressPrivateUntrusted_GetAnyAddress) \
775 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) \ 777 LIST_TEST(NetAddressPrivateUntrusted_GetFamily) \
776 LIST_TEST(NetAddressPrivateUntrusted_GetPort) \ 778 LIST_TEST(NetAddressPrivateUntrusted_GetPort) \
777 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) \ 779 LIST_TEST(NetAddressPrivateUntrusted_GetAddress) \
778 ) 780 )
779 781
780 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetAddressPrivate) { 782 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest,
783 MAYBE_PPAPI_NACL(NetAddressPrivate)) {
781 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; 784 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
782 } 785 }
783 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetAddressPrivate) { 786 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest,
787 MAYBE_PPAPI_NACL(NetAddressPrivate)) {
784 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; 788 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
785 } 789 }
786 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 790 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
787 MAYBE_PNACL_NONSFI(NetAddressPrivate)) { 791 MAYBE_PNACL_NONSFI(NetAddressPrivate)) {
788 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS; 792 RUN_NETADDRESS_PRIVATE_UNTRUSTED_SUBTESTS;
789 } 793 }
790 794
791 // NetworkMonitor tests. 795 // NetworkMonitor tests.
792 #define RUN_NETWORK_MONITOR_SUBTESTS \ 796 #define RUN_NETWORK_MONITOR_SUBTESTS \
793 RunTestViaHTTP( \ 797 RunTestViaHTTP( \
794 LIST_TEST(NetworkMonitor_Basic) \ 798 LIST_TEST(NetworkMonitor_Basic) \
795 LIST_TEST(NetworkMonitor_2Monitors) \ 799 LIST_TEST(NetworkMonitor_2Monitors) \
796 LIST_TEST(NetworkMonitor_DeleteInCallback) \ 800 LIST_TEST(NetworkMonitor_DeleteInCallback) \
797 ) 801 )
798 802
799 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) { 803 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, NetworkMonitor) {
800 RUN_NETWORK_MONITOR_SUBTESTS; 804 RUN_NETWORK_MONITOR_SUBTESTS;
801 } 805 }
802 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, NetworkMonitor) { 806 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(NetworkMonitor)) {
803 RUN_NETWORK_MONITOR_SUBTESTS; 807 RUN_NETWORK_MONITOR_SUBTESTS;
804 } 808 }
805 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, NetworkMonitor) { 809 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(NetworkMonitor)) {
806 RUN_NETWORK_MONITOR_SUBTESTS; 810 RUN_NETWORK_MONITOR_SUBTESTS;
807 } 811 }
808 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 812 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
809 MAYBE_PNACL_NONSFI(NetworkMonitor)) { 813 MAYBE_PNACL_NONSFI(NetworkMonitor)) {
810 RUN_NETWORK_MONITOR_SUBTESTS; 814 RUN_NETWORK_MONITOR_SUBTESTS;
811 } 815 }
812 816
813 // Flash tests. 817 // Flash tests.
814 #define RUN_FLASH_SUBTESTS \ 818 #define RUN_FLASH_SUBTESTS \
815 RunTestViaHTTP( \ 819 RunTestViaHTTP( \
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 LIST_TEST(WebSocket_UtilityBinarySendReceive) \ 864 LIST_TEST(WebSocket_UtilityBinarySendReceive) \
861 LIST_TEST(WebSocket_UtilityBufferedAmount) \ 865 LIST_TEST(WebSocket_UtilityBufferedAmount) \
862 ) 866 )
863 867
864 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) { 868 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket1) {
865 RUN_WEBSOCKET_SUBTESTS_1; 869 RUN_WEBSOCKET_SUBTESTS_1;
866 } 870 }
867 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) { 871 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, WebSocket2) {
868 RUN_WEBSOCKET_SUBTESTS_2; 872 RUN_WEBSOCKET_SUBTESTS_2;
869 } 873 }
870 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket1) { 874 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(WebSocket1)) {
871 RUN_WEBSOCKET_SUBTESTS_1; 875 RUN_WEBSOCKET_SUBTESTS_1;
872 } 876 }
873 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, WebSocket2) { 877 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(WebSocket2)) {
874 RUN_WEBSOCKET_SUBTESTS_2; 878 RUN_WEBSOCKET_SUBTESTS_2;
875 } 879 }
876 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket1) { 880 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(WebSocket1)) {
877 RUN_WEBSOCKET_SUBTESTS_1; 881 RUN_WEBSOCKET_SUBTESTS_1;
878 } 882 }
879 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, WebSocket2) { 883 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(WebSocket2)) {
880 RUN_WEBSOCKET_SUBTESTS_2; 884 RUN_WEBSOCKET_SUBTESTS_2;
881 } 885 }
882 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 886 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
883 MAYBE_PNACL_NONSFI(WebSocket1)) { 887 MAYBE_PNACL_NONSFI(WebSocket1)) {
884 RUN_WEBSOCKET_SUBTESTS_1; 888 RUN_WEBSOCKET_SUBTESTS_1;
885 } 889 }
886 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 890 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
887 MAYBE_PNACL_NONSFI(WebSocket2)) { 891 MAYBE_PNACL_NONSFI(WebSocket2)) {
888 RUN_WEBSOCKET_SUBTESTS_2; 892 RUN_WEBSOCKET_SUBTESTS_2;
889 } 893 }
890 894
891 // AudioConfig tests 895 // AudioConfig tests
892 #define RUN_AUDIO_CONFIG_SUBTESTS \ 896 #define RUN_AUDIO_CONFIG_SUBTESTS \
893 RunTestViaHTTP( \ 897 RunTestViaHTTP( \
894 LIST_TEST(AudioConfig_RecommendSampleRate) \ 898 LIST_TEST(AudioConfig_RecommendSampleRate) \
895 LIST_TEST(AudioConfig_ValidConfigs) \ 899 LIST_TEST(AudioConfig_ValidConfigs) \
896 LIST_TEST(AudioConfig_InvalidConfigs) \ 900 LIST_TEST(AudioConfig_InvalidConfigs) \
897 ) 901 )
898 902
899 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) { 903 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, AudioConfig) {
900 RUN_AUDIO_CONFIG_SUBTESTS; 904 RUN_AUDIO_CONFIG_SUBTESTS;
901 } 905 }
902 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioConfig) { 906 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(AudioConfig)) {
903 RUN_AUDIO_CONFIG_SUBTESTS; 907 RUN_AUDIO_CONFIG_SUBTESTS;
904 } 908 }
905 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) { 909 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioConfig)) {
906 RUN_AUDIO_CONFIG_SUBTESTS; 910 RUN_AUDIO_CONFIG_SUBTESTS;
907 } 911 }
908 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioConfig) { 912 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(AudioConfig)) {
909 RUN_AUDIO_CONFIG_SUBTESTS; 913 RUN_AUDIO_CONFIG_SUBTESTS;
910 } 914 }
911 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 915 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
912 MAYBE_PNACL_NONSFI(AudioConfig)) { 916 MAYBE_PNACL_NONSFI(AudioConfig)) {
913 RUN_AUDIO_CONFIG_SUBTESTS; 917 RUN_AUDIO_CONFIG_SUBTESTS;
914 } 918 }
915 919
916 // PPB_Audio tests. 920 // PPB_Audio tests.
917 #define RUN_AUDIO_SUBTESTS \ 921 #define RUN_AUDIO_SUBTESTS \
918 RunTestViaHTTP( \ 922 RunTestViaHTTP( \
919 LIST_TEST(Audio_Creation) \ 923 LIST_TEST(Audio_Creation) \
920 LIST_TEST(Audio_DestroyNoStop) \ 924 LIST_TEST(Audio_DestroyNoStop) \
921 LIST_TEST(Audio_Failures) \ 925 LIST_TEST(Audio_Failures) \
922 LIST_TEST(Audio_AudioCallback1) \ 926 LIST_TEST(Audio_AudioCallback1) \
923 LIST_TEST(Audio_AudioCallback2) \ 927 LIST_TEST(Audio_AudioCallback2) \
924 LIST_TEST(Audio_AudioCallback3) \ 928 LIST_TEST(Audio_AudioCallback3) \
925 LIST_TEST(Audio_AudioCallback4) \ 929 LIST_TEST(Audio_AudioCallback4) \
926 ) 930 )
927 931
928 #if defined(OS_LINUX) 932 #if defined(OS_LINUX)
929 // http://crbug.com/396464 933 // http://crbug.com/396464
930 #define MAYBE_Audio DISABLED_Audio 934 #define MAYBE_Audio DISABLED_Audio
931 #else 935 #else
932 #define MAYBE_Audio Audio 936 #define MAYBE_Audio Audio
933 #endif 937 #endif
934 // PPB_Audio is not supported in-process. 938 // PPB_Audio is not supported in-process.
935 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { 939 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) {
936 RUN_AUDIO_SUBTESTS; 940 RUN_AUDIO_SUBTESTS;
937 } 941 }
938 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { 942 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(Audio)) {
939 RUN_AUDIO_SUBTESTS; 943 RUN_AUDIO_SUBTESTS;
940 } 944 }
941 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) { 945 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(Audio)) {
942 RUN_AUDIO_SUBTESTS; 946 RUN_AUDIO_SUBTESTS;
943 } 947 }
944 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, Audio) { 948 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(Audio)) {
945 RUN_AUDIO_SUBTESTS; 949 RUN_AUDIO_SUBTESTS;
946 } 950 }
947 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 951 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
948 MAYBE_PNACL_NONSFI(Audio)) { 952 MAYBE_PNACL_NONSFI(Audio)) {
949 RUN_AUDIO_SUBTESTS; 953 RUN_AUDIO_SUBTESTS;
950 } 954 }
951 955
952 #define RUN_AUDIO_THREAD_CREATOR_SUBTESTS \ 956 #define RUN_AUDIO_THREAD_CREATOR_SUBTESTS \
953 RunTestViaHTTP( \ 957 RunTestViaHTTP( \
954 LIST_TEST(Audio_AudioThreadCreatorIsRequired) \ 958 LIST_TEST(Audio_AudioThreadCreatorIsRequired) \
955 LIST_TEST(Audio_AudioThreadCreatorIsCalled) \ 959 LIST_TEST(Audio_AudioThreadCreatorIsCalled) \
956 ) 960 )
957 961
958 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioThreadCreator) { 962 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest,
963 MAYBE_PPAPI_NACL(AudioThreadCreator)) {
959 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; 964 RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
960 } 965 }
961 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioThreadCreator)) { 966 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioThreadCreator)) {
962 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; 967 RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
963 } 968 }
964 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioThreadCreator) { 969 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest,
970 MAYBE_PPAPI_NACL(AudioThreadCreator)) {
965 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; 971 RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
966 } 972 }
967 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, 973 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest,
968 MAYBE_PNACL_NONSFI(AudioThreadCreator)) { 974 MAYBE_PNACL_NONSFI(AudioThreadCreator)) {
969 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; 975 RUN_AUDIO_THREAD_CREATOR_SUBTESTS;
970 } 976 }
971 977
972 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible); 978 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible);
973 #if defined(OS_MACOSX) 979 #if defined(OS_MACOSX)
974 // http://crbug.com/474399 980 // http://crbug.com/474399
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 #define RUN_VIEW_SUBTESTS \ 1050 #define RUN_VIEW_SUBTESTS \
1045 RunTestViaHTTP( \ 1051 RunTestViaHTTP( \
1046 LIST_TEST(View_SizeChange) \ 1052 LIST_TEST(View_SizeChange) \
1047 LIST_TEST(View_ClipChange) \ 1053 LIST_TEST(View_ClipChange) \
1048 LIST_TEST(View_ScrollOffsetChange) \ 1054 LIST_TEST(View_ScrollOffsetChange) \
1049 ) 1055 )
1050 1056
1051 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) { 1057 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View) {
1052 RUN_VIEW_SUBTESTS; 1058 RUN_VIEW_SUBTESTS;
1053 } 1059 }
1054 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, View) { 1060 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, MAYBE_PPAPI_NACL(View)) {
1055 RUN_VIEW_SUBTESTS; 1061 RUN_VIEW_SUBTESTS;
1056 } 1062 }
1057 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, View) { 1063 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(View)) {
1058 RUN_VIEW_SUBTESTS; 1064 RUN_VIEW_SUBTESTS;
1059 } 1065 }
1060 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) { 1066 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, MAYBE_PNACL_NONSFI(View)) {
1061 RUN_VIEW_SUBTESTS; 1067 RUN_VIEW_SUBTESTS;
1062 } 1068 }
1063 1069
1064 // FlashMessageLoop tests. 1070 // FlashMessageLoop tests.
1065 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \ 1071 #define RUN_FLASH_MESSAGE_LOOP_SUBTESTS \
1066 RunTest( \ 1072 RunTest( \
1067 LIST_TEST(FlashMessageLoop_Basics) \ 1073 LIST_TEST(FlashMessageLoop_Basics) \
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 NonSfiPackagedAppTest() : PackagedAppTest("nonsfi") { } 1244 NonSfiPackagedAppTest() : PackagedAppTest("nonsfi") { }
1239 1245
1240 void SetUpCommandLine(base::CommandLine* command_line) override { 1246 void SetUpCommandLine(base::CommandLine* command_line) override {
1241 PackagedAppTest::SetUpCommandLine(command_line); 1247 PackagedAppTest::SetUpCommandLine(command_line);
1242 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); 1248 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
1243 } 1249 }
1244 }; 1250 };
1245 1251
1246 // Load a packaged app, and wait for it to successfully post a "hello" message 1252 // Load a packaged app, and wait for it to successfully post a "hello" message
1247 // back. 1253 // back.
1248 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SuccessfulLoad) { 1254 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1255 MAYBE_PPAPI_NACL(SuccessfulLoad)) {
1249 RunTests("packaged_app"); 1256 RunTests("packaged_app");
1250 } 1257 }
1251 1258
1252 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, 1259 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest,
1253 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { 1260 MAYBE_PNACL_NONSFI(SuccessfulLoad)) {
1254 RunTests("packaged_app"); 1261 RunTests("packaged_app");
1255 } 1262 }
1256 1263
1257 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, MulticastPermissions) { 1264 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1265 MAYBE_PPAPI_NACL(MulticastPermissions)) {
1258 RunTests("multicast_permissions"); 1266 RunTests("multicast_permissions");
1259 } 1267 }
1260 1268
1261 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, NoSocketPermissions) { 1269 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1270 MAYBE_PPAPI_NACL(NoSocketPermissions)) {
1262 RunTests("no_socket_permissions"); 1271 RunTests("no_socket_permissions");
1263 } 1272 }
1264 1273
1265 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, SocketPermissions) { 1274 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
1275 MAYBE_PPAPI_NACL(SocketPermissions)) {
1266 RunTests("socket_permissions"); 1276 RunTests("socket_permissions");
1267 } 1277 }
1268 1278
1269 #endif 1279 #endif
OLDNEW
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698