summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 00:13:49 +0000
committerncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 00:13:49 +0000
commit9333c3a8fd93fdba695ad524870b0c0db265aab8 (patch)
tree5890ebb46fd9e21a5ba354eb004821ea3f8f617b
parent72d44e8b5095094809a5a1137038fb5dfe422134 (diff)
downloadchromium_src-9333c3a8fd93fdba695ad524870b0c0db265aab8.zip
chromium_src-9333c3a8fd93fdba695ad524870b0c0db265aab8.tar.gz
chromium_src-9333c3a8fd93fdba695ad524870b0c0db265aab8.tar.bz2
Migrate nacl_integration pm_redir_test to browser_tests.
BUG=154400 Review URL: https://codereview.chromium.org/108143007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/test/data/nacl/nacl_test_data.gyp29
-rw-r--r--chrome/test/data/nacl/postmessage_redir/pm_redir_test.cc (renamed from ppapi/native_client/tests/nacl_browser/postmessage_redir/pm_redir_test.cc)2
-rw-r--r--chrome/test/data/nacl/postmessage_redir/pm_redir_test.html (renamed from ppapi/native_client/tests/nacl_browser/postmessage_redir/pm_redir_test.html)30
-rw-r--r--chrome/test/nacl/nacl_browsertest.cc63
-rw-r--r--ppapi/native_client/chrome_main.scons1
-rw-r--r--ppapi/native_client/tests/nacl_browser/postmessage_redir/nacl.scons58
6 files changed, 113 insertions, 70 deletions
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
index 5c1580b..ef0e629 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -130,6 +130,35 @@
],
},
{
+ 'target_name': 'pm_redir_test',
+ 'type': 'none',
+ 'variables': {
+ 'nexe_target': 'pm_redir_test',
+ 'build_newlib': 1,
+ 'build_glibc': 1,
+ 'build_pnacl_newlib': 1,
+ 'nexe_destination_dir': 'nacl_test_data',
+ 'link_flags': [
+ '-lppapi',
+ '-lplatform',
+ '-lgio',
+ ],
+ 'sources': [
+ 'postmessage_redir/pm_redir_test.cc',
+ ],
+ 'test_files': [
+ 'postmessage_redir/pm_redir_test.html',
+ ],
+ },
+ 'dependencies': [
+ '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+ '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
+ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
+ '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
+ '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ ],
+ },
+ {
'target_name': 'pnacl_error_handling_test',
'type': 'none',
'variables': {
diff --git a/ppapi/native_client/tests/nacl_browser/postmessage_redir/pm_redir_test.cc b/chrome/test/data/nacl/postmessage_redir/pm_redir_test.cc
index d9f1eb8..0beaf94 100644
--- a/ppapi/native_client/tests/nacl_browser/postmessage_redir/pm_redir_test.cc
+++ b/chrome/test/data/nacl/postmessage_redir/pm_redir_test.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 The Chromium Authors. All rights reserved.
+ * Copyright 2013 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
diff --git a/ppapi/native_client/tests/nacl_browser/postmessage_redir/pm_redir_test.html b/chrome/test/data/nacl/postmessage_redir/pm_redir_test.html
index cbb4149..ee2de32 100644
--- a/ppapi/native_client/tests/nacl_browser/postmessage_redir/pm_redir_test.html
+++ b/chrome/test/data/nacl/postmessage_redir/pm_redir_test.html
@@ -1,5 +1,5 @@
<!--
- Copyright 2011 The Chromium Authors. All rights reserved.
+ Copyright 2013 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can
be found in the LICENSE file.
-->
@@ -16,18 +16,28 @@
<body>
<h1>Native Client I/O Redirection to Post Message Test</h1>
<div>
- <embed id="naclModule"
- name="naclModule"
- width=400 height=400
- src="pm_redir_test.nmf"
- basic_tests="2"
- stress_tests="0"
- style="background-color:gray"
- type="application/x-nacl" />
- </div>
<script type="text/javascript">
//<![CDATA[
+function createModule(id, src, type) {
+ return createNaClEmbed({
+ id: id,
+ src: src,
+ width: 400,
+ height: 400,
+ type: type
+ });
+}
+
+var mime = 'application/x-nacl';
+if (getTestArguments()['pnacl'] !== undefined) {
+ mime = 'application/x-pnacl';
+}
+var embed = createModule('naclModule', 'pm_redir_test.nmf', mime);
+embed.basic_tests ='2';
+embed.stress_tests = '0';
+document.body.appendChild(embed);
+
function setupTests(tester, plugin) {
tester.addAsyncTest('Test_output', function(status) {
plugin.addEventListener('message', function(message_event) {
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index eec3853..fd94fa1 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -11,6 +11,7 @@
#define TELEMETRY 1
+#include "base/environment.h"
#include "chrome/test/nacl/nacl_browsertest_util.h"
namespace {
@@ -159,4 +160,66 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) {
RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
}
+class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib {
+ public:
+ virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ // Env needs to be set early because nacl_helper is spawned before the test
+ // body on Linux.
+ scoped_ptr<base::Environment> env(base::Environment::Create());
+ env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage");
+ NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture();
+ }
+};
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectFg0) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stdout&thread=fg&delay_us=0"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectBg0) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stdout&thread=bg&delay_us=0"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectFg1) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stdout&thread=fg&delay_us=1000000"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectBg1) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stdout&thread=bg&delay_us=1000000"));
+}
+
+class NaClBrowserTestNewlibStderrPM : public NaClBrowserTestNewlib {
+ public:
+ virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ // Env needs to be set early because nacl_helper is spawned before the test
+ // body on Linux.
+ scoped_ptr<base::Environment> env(base::Environment::Create());
+ env->SetVar("NACL_EXE_STDERR", "DEBUG_ONLY:dev://postmessage");
+ NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture();
+ }
+};
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectFg0) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stderr&thread=fg&delay_us=0"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg0) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stderr&thread=bg&delay_us=0"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectFg1) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) {
+ RunNaClIntegrationTest(FILE_PATH_LITERAL(
+ "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000"));
+}
+
} // namespace
diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index 8f41ab0..eef13dc 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -39,7 +39,6 @@ ppapi_scons_files['nonvariant_test_scons_files'] = [
'tests/nacl_browser/browser_dynamic_library/nacl.scons',
'tests/nacl_browser/manifest_file/nacl.scons',
'tests/nacl_browser/nameservice/nacl.scons',
- 'tests/nacl_browser/postmessage_redir/nacl.scons',
'tests/ppapi_browser/bad/nacl.scons',
'tests/ppapi_browser/crash/nacl.scons',
'tests/ppapi_browser/extension_mime_handler/nacl.scons',
diff --git a/ppapi/native_client/tests/nacl_browser/postmessage_redir/nacl.scons b/ppapi/native_client/tests/nacl_browser/postmessage_redir/nacl.scons
deleted file mode 100644
index ee43d8d..0000000
--- a/ppapi/native_client/tests/nacl_browser/postmessage_redir/nacl.scons
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- python -*-
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-Import('env')
-
-pm_rd_obj = env.ComponentObject('pm_redir_test.o',
- 'pm_redir_test.cc')
-pm_rd_nexe_name = env.ProgramNameForNmf('pm_redir_test')
-pm_rd_nexe = env.ComponentProgram(pm_rd_nexe_name,
- pm_rd_obj,
- EXTRA_LIBS=['weak_ref',
- 'ppapi_cpp',
- 'pthread',
- 'platform',
- 'gio',
- ])
-env.Publish(pm_rd_nexe_name, 'run',
- ['pm_redir_test.html'])
-
-for (ostr, thr, delay_us, envar) in [
- ('stdout', 'fg', '0', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- ('stderr', 'fg', '0', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- ('stdout', 'bg', '0', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- ('stderr', 'bg', '0', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- # 1 millisecond
- ('stdout', 'fg', '1000', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- ('stderr', 'fg', '1000', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- ('stdout', 'bg', '1000', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- ('stderr', 'bg', '1000', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- # 1 second
- ('stdout', 'fg', '1000000', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- ('stderr', 'fg', '1000000', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- ('stdout', 'bg', '1000000', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- ('stderr', 'bg', '1000000', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- # 5 seconds -- disabled so we don't make the bots slow...
- # ('stdout', 'fg', '5000000', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- # ('stderr', 'fg', '5000000', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- # ('stdout', 'bg', '5000000', 'NACL_EXE_STDOUT=DEBUG_ONLY:dev://postmessage'),
- # ('stderr', 'bg', '5000000', 'NACL_EXE_STDERR=DEBUG_ONLY:dev://postmessage'),
- ]:
-
- node = env.PPAPIBrowserTester(
- 'pm_redir_'+ ostr + '_' + thr + '_' + delay_us + '_test.out',
- url='pm_redir_test.html',
- nmf_names=['pm_redir_test'],
- files=env.ExtractPublishedFiles(pm_rd_nexe_name),
- # args=['--debug'], # debug turns on srpc-level output, also on stdout
- test_args=[('stream', ostr), ('thread', thr), ('delay_us', delay_us)],
- # nacl_exe_stdout='DEBUG_ONLY:dev://postmessage'
- osenv=[envar])
-
- env.AddNodeToTestSuite(node,
- ['chrome_browser_tests'],
- ('run_pm_redir_' + ostr + '_' + thr +
- '_' + delay_us + '_chrome_browser_test'),
- is_broken=env.PPAPIBrowserTesterIsBroken())
generated by cgit v1.1 at 2025-03-11 07:33:12 +0000