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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons

Issue 10868029: Inlining PPAPI_LIBS as its now the same everywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # Test loading a NaCl-enabled Chrome Extension. This also covers parts 6 # Test loading a NaCl-enabled Chrome Extension. This also covers parts
7 # of {ppb,ppp}_instance interfaces that are not testable any other way. 7 # of {ppb,ppp}_instance interfaces that are not testable any other way.
8 8
9 # The extension registers the nacl module as a content handler for foo/bar. 9 # The extension registers the nacl module as a content handler for foo/bar.
10 10
11 Import('env') 11 Import('env')
12 12
13 # TODO(jvoung): Make a pnacl version of the nmf / or make the pexe generator 13 # TODO(jvoung): Make a pnacl version of the nmf / or make the pexe generator
14 # compatible with CopyLibsForExtension(). 14 # compatible with CopyLibsForExtension().
15 if env.Bit('pnacl_generate_pexe'): 15 if env.Bit('pnacl_generate_pexe'):
16 Return() 16 Return()
17 17
18 env.Prepend(CPPDEFINES=['XP_UNIX']) 18 env.Prepend(CPPDEFINES=['XP_UNIX'])
19 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 19 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
20 'extension_mime_handler') 20 'extension_mime_handler')
21 21
22 nexe = env.ProgramNameForNmf('ppapi_extension_mime_handler') 22 nexe = env.ProgramNameForNmf('ppapi_extension_mime_handler')
23 23
24 env.ComponentProgram( 24 env.ComponentProgram(
25 nexe, 25 nexe,
26 ['ppapi_extension_mime_handler.cc'], 26 ['ppapi_extension_mime_handler.cc'],
27 EXTRA_LIBS=['${PPAPI_LIBS}', 27 EXTRA_LIBS=['ppapi',
28 'ppapi_test_lib', 28 'ppapi_test_lib',
29 'pthread', 29 'pthread',
30 'platform', 30 'platform',
31 'gio']) 31 'gio'])
32 32
33 # Copy the extension into place (as a subdir in the staging dir). 33 # Copy the extension into place (as a subdir in the staging dir).
34 dest_copy = env.Replicate('$STAGING_DIR/ppapi_extension_mime_handler', 34 dest_copy = env.Replicate('$STAGING_DIR/ppapi_extension_mime_handler',
35 ['manifest.json', 35 ['manifest.json',
36 env.File('$STAGING_DIR/' + nexe + '$PROGSUFFIX')]) 36 env.File('$STAGING_DIR/' + nexe + '$PROGSUFFIX')])
37 dest_copy.append(env.CopyLibsForExtension( 37 dest_copy.append(env.CopyLibsForExtension(
(...skipping 25 matching lines...) Expand all
63 # so we disable this test in the standalone NaCl build, where running 63 # so we disable this test in the standalone NaCl build, where running
64 # Chromium tests is deprecated anyway. For more info, see: 64 # Chromium tests is deprecated anyway. For more info, see:
65 # http://code.google.com/p/chromium/issues/detail?id=138289 65 # http://code.google.com/p/chromium/issues/detail?id=138289
66 is_broken = (env.PPAPIBrowserTesterIsBroken() or 66 is_broken = (env.PPAPIBrowserTesterIsBroken() or
67 not env.Bit('disable_dynamic_plugin_loading')) 67 not env.Bit('disable_dynamic_plugin_loading'))
68 68
69 env.AddNodeToTestSuite(node, 69 env.AddNodeToTestSuite(node,
70 ['chrome_browser_tests'], 70 ['chrome_browser_tests'],
71 'run_ppapi_extension_mime_handler_browser_test', 71 'run_ppapi_extension_mime_handler_browser_test',
72 is_broken=is_broken) 72 is_broken=is_broken)
OLDNEW
« no previous file with comments | « ppapi/native_client/tests/ppapi_browser/crash/nacl.scons ('k') | ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698