summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ppapi/tests/nacl.scons17
-rw-r--r--ppapi/tests/test_case.html13
-rw-r--r--ppapi/tests/test_case.nmf7
-rw-r--r--ppapi/tests/test_directory_reader.cc6
-rw-r--r--ppapi/tests/test_graphics_2d.cc11
-rw-r--r--ppapi/tests/test_url_loader.cc24
6 files changed, 44 insertions, 34 deletions
diff --git a/ppapi/tests/nacl.scons b/ppapi/tests/nacl.scons
index e4d0b9d..727e751 100644
--- a/ppapi/tests/nacl.scons
+++ b/ppapi/tests/nacl.scons
@@ -4,18 +4,25 @@
Import('env')
-ppapi_tests_nexe = env.ComponentProgram('ppapi_tests.nexe',
- Glob('*.cc'),
+ppapi_tests_target = 'ppapi_tests_%s.nexe' % env.get('TARGET_FULLARCH')
+
+ppapi_tests_nexe = env.ComponentProgram(ppapi_tests_target,
+ [Glob('*.cc')],
EXTRA_LIBS=['ppruntime',
'ppapi_cpp',
+ 'platform',
+ 'imc',
+ 'gio',
'pthread',
'srpc'])
+
# Note that the html is required to run this program.
# To run, load page with mode=nacl search string:
# http://localhost:5103/scons-out/nacl-x86-32/staging/test_case.html?mode=nacl
-env.Publish('ppapi_tests.nexe', 'run',
+# http://localhost:5103/scons-out/nacl-x86-64/staging/test_case.html?mode=nacl
+env.Publish(ppapi_tests_nexe, 'run',
['test_case.html',
+ 'test_case.nmf',
'test_image_data',
'test_page.css',
- 'test_url_loader_data'])
-
+ 'test_url_loader_data']) \ No newline at end of file
diff --git a/ppapi/tests/test_case.html b/ppapi/tests/test_case.html
index 5fd094c..d055e52 100644
--- a/ppapi/tests/test_case.html
+++ b/ppapi/tests/test_case.html
@@ -1,4 +1,6 @@
<html><head>
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="-1" />
<link rel="stylesheet" href="test_page.css">
<script>
function AdjustHeight(frameWin) {
@@ -25,7 +27,11 @@ function AppendFrame(testcase, i) {
p.appendChild(title);
var frame = document.createElement("IFRAME");
- frame.setAttribute("src", "?" + testcase);
+ var mode = ExtractSearchParameter("mode");
+ if (mode == "nacl")
+ frame.setAttribute("src", "?testcase=" + testcase + "&mode=nacl");
+ else
+ frame.setAttribute("src", "?testcase=" + testcase);
frame.setAttribute("onload", "LoadNext(" + (i + 1) + ")");
p.appendChild(frame);
@@ -66,10 +72,9 @@ onload = function() {
document.title = 'Test ' + testcase;
var obj;
if (mode == "nacl") {
- var nexes = "ARM: ppapi_tests_arm.nexe \nx86-32: ppapi_tests.nexe \nx86-64: ppapi_tests_x86_64.";
obj = document.createElement("OBJECT");
- obj.setAttribute("type", "application/x-ppapi-nacl-srpc");
- obj.setAttribute("nexes", nexes);
+ obj.setAttribute("type", "application/x-nacl");
+ obj.setAttribute("nacl", "test_case.nmf");
obj.setAttribute("mode", mode);
} else {
var mimeType = "application/x-ppapi-tests";
diff --git a/ppapi/tests/test_case.nmf b/ppapi/tests/test_case.nmf
new file mode 100644
index 0000000..614ead4
--- /dev/null
+++ b/ppapi/tests/test_case.nmf
@@ -0,0 +1,7 @@
+{
+ "nexes": {
+ "x86-64": "ppapi_tests_x86-64.nexe",
+ "x86-32": "ppapi_tests_x86-32.nexe",
+ "arm" : "ppapi_tests_arm.nexe",
+ }
+} \ No newline at end of file
diff --git a/ppapi/tests/test_directory_reader.cc b/ppapi/tests/test_directory_reader.cc
index 8fa3794..99aa171 100644
--- a/ppapi/tests/test_directory_reader.cc
+++ b/ppapi/tests/test_directory_reader.cc
@@ -54,19 +54,19 @@ std::string TestDirectoryReader::TestGetNextFile() {
pp::FileRef_Dev file_ref_2(file_system, "/file_2");
pp::FileRef_Dev file_ref_3(file_system, "/file_3");
- pp::FileIO_Dev file_io_1;
+ pp::FileIO_Dev file_io_1(instance_);
rv = file_io_1.Open(file_ref_1, PP_FILEOPENFLAG_CREATE, callback);
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv != PP_OK)
return ReportError("FileIO::Open", rv);
- pp::FileIO_Dev file_io_2;
+ pp::FileIO_Dev file_io_2(instance_);
rv = file_io_2.Open(file_ref_2, PP_FILEOPENFLAG_CREATE, callback);
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv != PP_OK)
return ReportError("FileIO::Open", rv);
- pp::FileIO_Dev file_io_3;
+ pp::FileIO_Dev file_io_3(instance_);
rv = file_io_3.Open(file_ref_3, PP_FILEOPENFLAG_CREATE, callback);
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
diff --git a/ppapi/tests/test_graphics_2d.cc b/ppapi/tests/test_graphics_2d.cc
index 6c484b9..32f12cd 100644
--- a/ppapi/tests/test_graphics_2d.cc
+++ b/ppapi/tests/test_graphics_2d.cc
@@ -38,17 +38,8 @@ bool TestGraphics2D::Init() {
pp::Module::Get()->GetBrowserInterface(PPB_GRAPHICS_2D_INTERFACE));
image_data_interface_ = reinterpret_cast<PPB_ImageData const*>(
pp::Module::Get()->GetBrowserInterface(PPB_IMAGEDATA_INTERFACE));
- testing_interface_ = reinterpret_cast<PPB_Testing_Dev const*>(
- pp::Module::Get()->GetBrowserInterface(PPB_TESTING_DEV_INTERFACE));
- if (!testing_interface_) {
- // Give a more helpful error message for the testing interface being gone
- // since that needs special enabling in Chrome.
- instance_->AppendError("This test needs the testing interface, which is "
- "not currently available. In Chrome, use --enable-pepper-testing when "
- "launching.");
- }
return graphics_2d_interface_ && image_data_interface_ &&
- testing_interface_;
+ InitTestingInterface();
}
void TestGraphics2D::RunTest() {
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index 2e708cf..6a4d62e 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -128,13 +128,13 @@ std::string TestURLLoader::LoadAndCompareBody(
}
std::string TestURLLoader::TestBasicGET() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("test_url_loader_data/hello.txt");
return LoadAndCompareBody(request, "hello\n");
}
std::string TestURLLoader::TestBasicPOST() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("/echo");
request.SetMethod("POST");
std::string postdata("postdata");
@@ -143,7 +143,7 @@ std::string TestURLLoader::TestBasicPOST() {
}
std::string TestURLLoader::TestCompoundBodyPOST() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("/echo");
request.SetMethod("POST");
std::string postdata1("post");
@@ -154,7 +154,7 @@ std::string TestURLLoader::TestCompoundBodyPOST() {
}
std::string TestURLLoader::TestEmptyDataPOST() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("/echo");
request.SetMethod("POST");
request.AppendDataToBody("", 0);
@@ -162,7 +162,7 @@ std::string TestURLLoader::TestEmptyDataPOST() {
}
std::string TestURLLoader::TestBinaryDataPOST() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("/echo");
request.SetMethod("POST");
const char postdata_chars[] =
@@ -174,14 +174,14 @@ std::string TestURLLoader::TestBinaryDataPOST() {
}
std::string TestURLLoader::TestCustomRequestHeader() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("/echoheader?Foo");
request.SetHeaders("Foo: 1");
return LoadAndCompareBody(request, "1");
}
std::string TestURLLoader::TestIgnoresBogusContentLength() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("/echo");
request.SetMethod("POST");
request.SetHeaders("Content-Length: 400");
@@ -191,7 +191,7 @@ std::string TestURLLoader::TestIgnoresBogusContentLength() {
}
std::string TestURLLoader::TestStreamToFile() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("test_url_loader_data/hello.txt");
request.SetStreamToFile(true);
@@ -249,7 +249,7 @@ std::string TestURLLoader::TestStreamToFile() {
}
std::string TestURLLoader::TestSameOriginRestriction() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("http://www.google.com/");
TestCompletionCallback callback(instance_->pp_instance());
@@ -272,7 +272,7 @@ std::string TestURLLoader::TestSameOriginRestriction() {
}
std::string TestURLLoader::TestCrossOriginRequest() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
// Create a URL that will be considered to be a different origin.
request.SetURL("http://127.0.0.1/test_url_loader_data/hello.txt");
request.SetAllowCrossOriginRequests(true);
@@ -294,7 +294,7 @@ std::string TestURLLoader::TestCrossOriginRequest() {
// This test should cause a redirect and ensure that the loader runs
// the callback, rather than following the redirect.
std::string TestURLLoader::TestAuditURLRedirect() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
// This path will cause the server to return a 301 redirect.
request.SetURL("/server-redirect?www.google.com");
request.SetFollowRedirects(false);
@@ -323,7 +323,7 @@ std::string TestURLLoader::TestAuditURLRedirect() {
}
std::string TestURLLoader::TestAbortCalls() {
- pp::URLRequestInfo request;
+ pp::URLRequestInfo request(instance_);
request.SetURL("test_url_loader_data/hello.txt");
TestCompletionCallback callback(instance_->pp_instance());
generated by cgit v1.1 at 2025-02-12 20:05:45 +0000