summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/chrome_tests.gypi21
-rw-r--r--chrome/test/ui/ppapi_uitest.cc107
-rw-r--r--net/test/test_server.cc6
-rw-r--r--ppapi/native_client/tests/ppapi_tests/test_case.nmf6
-rw-r--r--ppapi/ppapi_tests.gypi92
-rw-r--r--ppapi/tests/test_url_loader.cc7
6 files changed, 32 insertions, 207 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ebd122f..852c9ce 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -787,27 +787,6 @@
'../content/worker/test/worker_uitest.cc',
],
'conditions': [
- ['disable_nacl!=1', {
- 'dependencies': [
- '../ppapi/ppapi_internal.gyp:ppapi_nacl_tests',
- ],
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)',
- 'files': [
- '../ppapi/tests/test_case.html',
- '../ppapi/tests/test_page.css',
- '../ppapi/native_client/tests/ppapi_tests/test_case.nmf',
- ],
- },
- {
- 'destination': '<(PRODUCT_DIR)/test_url_loader_data',
- 'files': [
- '../ppapi/tests/test_url_loader_data/hello.txt',
- ],
- },
- ],
- }],
['target_arch!="arm"', {
'dependencies': [
'../webkit/webkit.gyp:copy_npapi_test_plugin',
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 4c00e4b..0b25237 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -6,10 +6,7 @@
#include "base/path_service.h"
#include "base/test/test_timeouts.h"
#include "build/build_config.h"
-#include "content/browser/plugin_service.h"
#include "content/public/common/content_switches.h"
-#include "content/common/pepper_plugin_registry.h"
-#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
@@ -30,9 +27,24 @@ const char library_name[] = "libppapi_tests.so";
} // namespace
-class PPAPITestBase : public UITest {
+// In-process plugin test runner. See OutOfProcessPPAPITest below for the
+// out-of-process version.
+class PPAPITest : public UITest {
public:
- PPAPITestBase() {
+ PPAPITest() {
+ // Append the switch to register the pepper plugin.
+ // library name = <out dir>/<test_name>.<library_extension>
+ // MIME type = application/x-ppapi-<test_name>
+ FilePath plugin_dir;
+ PathService::Get(base::DIR_EXE, &plugin_dir);
+
+ FilePath plugin_lib = plugin_dir.Append(library_name);
+ EXPECT_TRUE(file_util::PathExists(plugin_lib));
+ FilePath::StringType pepper_plugin = plugin_lib.value();
+ pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
+ launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins,
+ pepper_plugin);
+
// The test sends us the result via a cookie.
launch_arguments_.AppendSwitch(switches::kEnableFileCookies);
@@ -44,12 +56,9 @@ class PPAPITestBase : public UITest {
launch_arguments_.AppendSwitch(switches::kDisableSmoothScrolling);
}
- virtual std::string BuildQuery(const std::string& base,
- const std::string& test_case)=0;
-
void RunTest(const std::string& test_case) {
FilePath test_path;
- EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_path));
+ PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
test_path = test_path.Append(FILE_PATH_LITERAL("ppapi"));
test_path = test_path.Append(FILE_PATH_LITERAL("tests"));
test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html"));
@@ -58,19 +67,20 @@ class PPAPITestBase : public UITest {
EXPECT_TRUE(file_util::PathExists(test_path));
GURL::Replacements replacements;
- std::string query = BuildQuery("", test_case);
+ std::string query("testcase=");
+ query += test_case;
replacements.SetQuery(query.c_str(), url_parse::Component(0, query.size()));
GURL test_url = net::FilePathToFileURL(test_path);
RunTestURL(test_url.ReplaceComponents(replacements));
}
void RunTestViaHTTP(const std::string& test_case) {
- FilePath fp = CommandLine::ForCurrentProcess()->GetProgram();
net::TestServer test_server(
- net::TestServer::TYPE_HTTP, fp.DirName());
+ net::TestServer::TYPE_HTTP,
+ FilePath(FILE_PATH_LITERAL("ppapi/tests")));
ASSERT_TRUE(test_server.Start());
- std::string query = BuildQuery("files/test_case.html?", test_case);
- RunTestURL(test_server.GetURL(query));
+ RunTestURL(
+ test_server.GetURL("files/test_case.html?testcase=" + test_case));
}
private:
@@ -109,32 +119,6 @@ class PPAPITestBase : public UITest {
}
};
-// In-process plugin test runner. See OutOfProcessPPAPITest below for the
-// out-of-process version.
-class PPAPITest : public PPAPITestBase {
- public:
- PPAPITest() {
- // Append the switch to register the pepper plugin.
- // library name = <out dir>/<test_name>.<library_extension>
- // MIME type = application/x-ppapi-<test_name>
- FilePath plugin_dir;
- EXPECT_TRUE(PathService::Get(base::DIR_EXE, &plugin_dir));
-
- FilePath plugin_lib = plugin_dir.Append(library_name);
- EXPECT_TRUE(file_util::PathExists(plugin_lib));
- FilePath::StringType pepper_plugin = plugin_lib.value();
- pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
- launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins,
- pepper_plugin);
- }
-
- std::string BuildQuery(const std::string& base,
- const std::string& test_case){
- return StringPrintf("%stestcase=%s", base.c_str(), test_case.c_str());
- }
-
-};
-
// Variant of PPAPITest that runs plugins out-of-process to test proxy
// codepaths.
class OutOfProcessPPAPITest : public PPAPITest {
@@ -145,27 +129,6 @@ class OutOfProcessPPAPITest : public PPAPITest {
}
};
-// NaCl plugin test runner.
-class PPAPINaClTest : public PPAPITestBase {
- public:
- PPAPINaClTest() {
- FilePath plugin_lib;
- EXPECT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));
- EXPECT_TRUE(file_util::PathExists(plugin_lib));
-
- // Enable running NaCl outside of the store.
- launch_arguments_.AppendSwitch(switches::kEnableNaCl);
- }
-
- // Append the correct mode and testcase string
- std::string BuildQuery(const std::string& base,
- const std::string& test_case) {
- return StringPrintf("%smode=nacl&testcase=%s", base.c_str(),
- test_case.c_str());
- }
-};
-
-
// Use these macros to run the tests for a specific interface.
// Most interfaces should be tested with both macros.
#define TEST_PPAPI_IN_PROCESS(test_name) \
@@ -188,12 +151,6 @@ class PPAPINaClTest : public PPAPITestBase {
}
-// NaCl based PPAPI tests
-#define TEST_PPAPI_NACL_VIA_HTTP(test_name) \
- TEST_F(PPAPINaClTest, test_name) { \
- RunTestViaHTTP(#test_name); \
-}
-
//
// Interface tests.
//
@@ -206,7 +163,6 @@ TEST_PPAPI_OUT_OF_PROCESS(Core)
TEST_PPAPI_IN_PROCESS(CursorControl)
TEST_PPAPI_OUT_OF_PROCESS(CursorControl)
-TEST_PPAPI_NACL_VIA_HTTP(CursorControl)
TEST_PPAPI_IN_PROCESS(Instance)
// http://crbug.com/91729
@@ -214,16 +170,15 @@ TEST_PPAPI_OUT_OF_PROCESS(DISABLED_Instance)
TEST_PPAPI_IN_PROCESS(Graphics2D)
TEST_PPAPI_OUT_OF_PROCESS(Graphics2D)
-TEST_PPAPI_NACL_VIA_HTTP(Graphics2D)
TEST_PPAPI_IN_PROCESS(ImageData)
TEST_PPAPI_OUT_OF_PROCESS(ImageData)
-TEST_PPAPI_NACL_VIA_HTTP(ImageData)
TEST_PPAPI_IN_PROCESS(Buffer)
TEST_PPAPI_OUT_OF_PROCESS(Buffer)
TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader)
+
// http://crbug.com/89961
#if defined(OS_WIN)
// It often takes too long time (and fails otherwise) on Windows.
@@ -231,22 +186,19 @@ TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader)
#else
#define MAYBE_URLLoader FAILS_URLLoader
#endif
+
TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) {
RunTestViaHTTP("URLLoader");
}
-
-
TEST_PPAPI_IN_PROCESS(PaintAggregator)
TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator)
-TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator)
TEST_PPAPI_IN_PROCESS(Scrollbar)
// http://crbug.com/89961
TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) {
RunTest("Scrollbar");
}
-TEST_PPAPI_NACL_VIA_HTTP(Scrollbar)
TEST_PPAPI_IN_PROCESS(URLUtil)
TEST_PPAPI_OUT_OF_PROCESS(URLUtil)
@@ -262,7 +214,6 @@ TEST_PPAPI_IN_PROCESS(Var)
TEST_F(OutOfProcessPPAPITest, FAILS_Var) {
RunTest("Var");
}
-TEST_PPAPI_NACL_VIA_HTTP(Var)
TEST_PPAPI_IN_PROCESS(VarDeprecated)
// Disabled because it times out: http://crbug.com/89961
@@ -289,7 +240,6 @@ TEST_PPAPI_OUT_OF_PROCESS(PostMessage_NonMainThread)
TEST_PPAPI_IN_PROCESS(Memory)
TEST_PPAPI_OUT_OF_PROCESS(Memory)
-TEST_PPAPI_NACL_VIA_HTTP(Memory)
TEST_PPAPI_IN_PROCESS(VideoDecoder)
TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
@@ -302,18 +252,13 @@ TEST_F(PPAPITest, FAILS_FileIO) {
TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) {
RunTestViaHTTP("FileIO");
}
-TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO)
-
TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
// Disabled because it times out: http://crbug.com/89961
//TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
-TEST_PPAPI_NACL_VIA_HTTP(FileRef)
-
TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
-TEST_PPAPI_NACL_VIA_HTTP(FileSystem)
// http://crbug.com/96767 and 104384 for aura.
#if !defined(OS_MACOSX) && !defined(USE_AURA)
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 918e1b6..4850f4f 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -274,11 +274,7 @@ void TestServer::Init(const FilePath& document_root) {
FilePath src_dir;
PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
- if (document_root.IsAbsolute()) {
- document_root_ = document_root;
- } else {
- document_root_ = src_dir.Append(document_root);
- }
+ document_root_ = src_dir.Append(document_root);
certificates_dir_ = src_dir.Append(FILE_PATH_LITERAL("net"))
.Append(FILE_PATH_LITERAL("data"))
diff --git a/ppapi/native_client/tests/ppapi_tests/test_case.nmf b/ppapi/native_client/tests/ppapi_tests/test_case.nmf
index f0bb249..3528855 100644
--- a/ppapi/native_client/tests/ppapi_tests/test_case.nmf
+++ b/ppapi/native_client/tests/ppapi_tests/test_case.nmf
@@ -1,7 +1,7 @@
{
"program": {
- "x86-64": {"url": "ppapi_nacl_tests_newlib_x64.nexe"},
- "x86-32": {"url": "ppapi_nacl_tests_newlib_x32.nexe"},
- "arm": {"url": "ppapi_nacl_tests_newlib_arm.nexe"}
+ "x86-64": {"url": "ppapi_tests_x86-64.nexe"},
+ "x86-32": {"url": "ppapi_tests_x86-32.nexe"},
+ "arm": {"url": "ppapi_tests_arm.nexe"}
}
}
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index f60403c..48f6745 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -414,96 +414,4 @@
],
},
],
- 'conditions': [
- ['disable_nacl!=1', {
- 'targets': [
- {
- 'target_name': 'ppapi_nacl_tests',
- 'type': 'none',
- 'dependencies': [
- 'native_client/native_client.gyp:ppapi_lib',
- 'native_client/native_client.gyp:nacl_irt',
- 'ppapi.gyp:ppapi_cpp_lib',
- ],
- 'variables': {
- 'nexe_target': 'ppapi_nacl_tests',
- 'build_glibc': 0,
- 'build_newlib': 1,
- 'include_dirs': [
- 'lib/gl/include',
- '..',
- ],
- 'link_flags': [
- '-lppapi_cpp',
- '-lppapi',
- ],
- 'extra_deps64': [
- '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi_cpp.a',
- '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi.a',
- ],
- 'extra_deps32': [
- '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi_cpp.a',
- '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi.a',
- ],
- 'sources': [
- # Common test files
- 'tests/test_case.cc',
- 'tests/test_utils.cc',
- 'tests/testing_instance.cc',
-
- # Compile-time tests
- 'tests/test_c_includes.c',
- 'tests/test_cpp_includes.cc',
- 'tests/test_struct_sizes.c',
- # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
-
- # Add/uncomment PPAPI interfaces below when they get proxied.
- # Not yet proxied.
- #'test_broker.cc',
- # Not yet proxied.
- #'test_buffer.cc',
- # Not yet proxied.
- #'test_char_set.cc',
- 'tests/test_cursor_control.cc',
- # Fails in DeleteDirectoryRecursively.
- # BUG: http://code.google.com/p/nativeclient/issues/detail?id=2107
- #'test_directory_reader.cc',
- 'tests/test_file_io.cc',
- 'tests/test_file_ref.cc',
- 'tests/test_file_system.cc',
- 'tests/test_memory.cc',
- 'tests/test_graphics_2d.cc',
- 'tests/test_image_data.cc',
- 'tests/test_paint_aggregator.cc',
- # test_post_message.cc relies on synchronous scripting, which is not
- # available for untrusted tests.
- # Does not compile under nacl (uses private interface ExecuteScript).
- #'test_post_message.cc',
- 'tests/test_scrollbar.cc',
- # Not yet proxied.
- #'tests/test_transport.cc',
- # Not yet proxied.
- #'tests/test_uma.cc',
- # Activating the URL loader test requires a test httpd that
- # understands HTTP POST, which our current httpd.py doesn't.
- # It also requires deactivating the tests that use FileIOTrusted
- # when running in NaCl.
- #'tests/test_url_loader.cc',
- # Does not compile under nacl (uses VarPrivate).
- #'test_url_util.cc',
- # Not yet proxied.
- #'test_video_decoder.cc',
- 'tests/test_var.cc',
-
- # Deprecated test cases.
- #'tests/test_instance_deprecated.cc',
- # Var_deprecated fails in TestPassReference, and we probably won't
- # fix it.
- #'tests/test_var_deprecated.cc'
- ],
- },
- },
- ],
- }],
- ],
}
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index edbbbbf..44f969c 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -87,11 +87,8 @@ void TestURLLoader::RunTests(const std::string& filter) {
RUN_TEST_FORCEASYNC_AND_NOT(BinaryDataPOST, filter);
RUN_TEST_FORCEASYNC_AND_NOT(CustomRequestHeader, filter);
RUN_TEST_FORCEASYNC_AND_NOT(FailsBogusContentLength, filter);
-// Disable portion of test which failes when the HTTP server's
-// data_dir is moved to PRODUCT_DIR.
-// see: http://code.google.com/p/chromium/issues/detail?id=103690
-// RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction, filter);
-// RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest, filter);
+ RUN_TEST_FORCEASYNC_AND_NOT(SameOriginRestriction, filter);
+ RUN_TEST_FORCEASYNC_AND_NOT(CrossOriginRequest, filter);
RUN_TEST_FORCEASYNC_AND_NOT(JavascriptURLRestriction, filter);
RUN_TEST_FORCEASYNC_AND_NOT(MethodRestriction, filter);
RUN_TEST_FORCEASYNC_AND_NOT(HeaderRestriction, filter);
generated by cgit v1.1 at 2025-01-19 09:09:21 +0000