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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/ppb_image_data/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 # This test uses ppapi_test_lib. 6 # This test uses ppapi_test_lib.
7 7
8 Import('env') 8 Import('env')
9 9
10 env.Prepend(CPPDEFINES=['XP_UNIX']) 10 env.Prepend(CPPDEFINES=['XP_UNIX'])
11 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 11 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
12 'ppb_image_data') 12 'ppb_image_data')
13 13
14 nexe = env.ProgramNameForNmf('ppapi_ppb_image_data') 14 nexe = env.ProgramNameForNmf('ppapi_ppb_image_data')
15 env.Alias('ppapi_ppb_image_data${PROGSUFFIX}', 15 env.Alias('ppapi_ppb_image_data${PROGSUFFIX}',
16 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) 16 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
17 17
18 env.ComponentProgram( 18 env.ComponentProgram(
19 nexe, 19 nexe,
20 ['ppapi_ppb_image_data.cc'], 20 ['ppapi_ppb_image_data.cc'],
21 EXTRA_LIBS=['${PPAPI_LIBS}', 21 EXTRA_LIBS=['ppapi',
22 'ppapi_test_lib', 22 'ppapi_test_lib',
23 'platform', # for CHECK 23 'platform', # for CHECK
24 'pthread', 24 'pthread',
25 'gio', 25 'gio',
26 ]) 26 ])
27 27
28 env.Publish(nexe, 'run', 28 env.Publish(nexe, 'run',
29 [ 'ppapi_ppb_image_data.html', 29 [ 'ppapi_ppb_image_data.html',
30 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' 30 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
31 'browserdata/nacltest.js') ]) 31 'browserdata/nacltest.js') ])
32 32
33 node = env.PPAPIBrowserTester('ppapi_ppb_image_data_browser_test.out', 33 node = env.PPAPIBrowserTester('ppapi_ppb_image_data_browser_test.out',
34 url='ppapi_ppb_image_data.html', 34 url='ppapi_ppb_image_data.html',
35 nmf_names=['ppapi_ppb_image_data'], 35 nmf_names=['ppapi_ppb_image_data'],
36 files=env.ExtractPublishedFiles(nexe)) 36 files=env.ExtractPublishedFiles(nexe))
37 37
38 env.AddNodeToTestSuite(node, 38 env.AddNodeToTestSuite(node,
39 ['chrome_browser_tests'], 39 ['chrome_browser_tests'],
40 'run_ppapi_ppb_image_data_browser_test', 40 'run_ppapi_ppb_image_data_browser_test',
41 is_broken=env.PPAPIBrowserTesterIsBroken()) 41 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698