summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client/chrome_main.scons
diff options
context:
space:
mode:
authorksakamoto@chromium.org <ksakamoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-18 01:33:54 +0000
committerksakamoto@chromium.org <ksakamoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-18 01:33:54 +0000
commit45c71343a3e6b19d3b86319f3b52c3d9e239b298 (patch)
tree6e604efeaf323b09c9594396ddb7f2619fa69f09 /ppapi/native_client/chrome_main.scons
parent8fc674ea11b1c4d9662845d6d86ad53c2bbc773e (diff)
downloadchromium_src-45c71343a3e6b19d3b86319f3b52c3d9e239b298.zip
chromium_src-45c71343a3e6b19d3b86319f3b52c3d9e239b298.tar.gz
chromium_src-45c71343a3e6b19d3b86319f3b52c3d9e239b298.tar.bz2
Revert 241424 "Port ppapi_bad test from nacl_integration to brow..."
Broke cros_daisy Build. http://build.chromium.org/p/tryserver.chromium/builders/cros_daisy/builds/3191 > Port ppapi_bad test from nacl_integration to browser_tests. > > PNaCl is not supported because crash throttling interferes with the test. > CORS tests were removed because they were redunant with existing tests and would > have been difficult to port because of how browser_test's http server behaves. > The dynamic loading test was removed because it required a golden file and would > likely never work as a browser_test. > > BUG=154400 > > Review URL: https://codereview.chromium.org/116843002 TBR=ncbray@chromium.org Review URL: https://codereview.chromium.org/109283007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client/chrome_main.scons')
-rw-r--r--ppapi/native_client/chrome_main.scons1
1 files changed, 1 insertions, 0 deletions
diff --git a/ppapi/native_client/chrome_main.scons b/ppapi/native_client/chrome_main.scons
index c43b9a1..e8593a4 100644
--- a/ppapi/native_client/chrome_main.scons
+++ b/ppapi/native_client/chrome_main.scons
@@ -39,6 +39,7 @@ 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/ppapi_browser/bad/nacl.scons',
'tests/ppapi_browser/extension_mime_handler/nacl.scons',
'tests/ppapi_browser/manifest/nacl.scons',
'tests/ppapi_test_lib/nacl.scons',