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

Unified Diff: chrome/test/ppapi/ppapi_test.cc

Issue 12288013: Add PNaCl PPAPI browser tests via pre-translation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/ppapi/ppapi_test.h ('k') | ppapi/ppapi_untrusted.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ppapi/ppapi_test.cc
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 40aaaf340ab8e4dd42dc089392b12dc40eac69cf..fd35776b87c2465db0f3a2190d8e93c5f4b93e77 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -321,6 +321,7 @@ void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
// Enable running NaCl outside of the store.
command_line->AppendSwitch(switches::kEnableNaCl);
+ command_line->AppendSwitch(switches::kEnablePnacl);
command_line->AppendSwitchASCII(switches::kAllowNaClSocketAPI, "127.0.0.1");
}
@@ -338,6 +339,13 @@ std::string PPAPINaClGLibcTest::BuildQuery(const std::string& base,
test_case.c_str());
}
+// Append the correct mode and testcase string
+std::string PPAPINaClPNaClTest::BuildQuery(const std::string& base,
+ const std::string& test_case) {
+ return StringPrintf("%smode=nacl_pnacl&testcase=%s", base.c_str(),
+ test_case.c_str());
+}
+
void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
CommandLine* command_line) {
PPAPITestBase::SetUpCommandLine(command_line);
@@ -348,6 +356,7 @@ void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
// Enable running NaCl outside of the store.
command_line->AppendSwitch(switches::kEnableNaCl);
+ command_line->AppendSwitch(switches::kEnablePnacl);
}
// Append the correct mode and testcase string
« no previous file with comments | « chrome/test/ppapi/ppapi_test.h ('k') | ppapi/ppapi_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698