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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/ppb_var/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, 4 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_var') 12 'ppb_var')
13 13
14 nexe = env.ProgramNameForNmf('ppapi_ppb_var') 14 nexe = env.ProgramNameForNmf('ppapi_ppb_var')
15 env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) 15 env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
16 16
17 env.ComponentProgram( 17 env.ComponentProgram(
18 nexe, 18 nexe,
19 ['ppapi_ppb_var.cc'], 19 ['ppapi_ppb_var.cc'],
20 EXTRA_LIBS=['${PPAPI_LIBS}', 20 EXTRA_LIBS=['ppapi',
21 'ppapi_test_lib', 21 'ppapi_test_lib',
22 'pthread', 22 'pthread',
23 'platform', 23 'platform',
24 'gio']) 24 'gio'])
25 25
26 # Note that the html is required to run this program. 26 # Note that the html is required to run this program.
27 env.Publish(nexe, 'run', 27 env.Publish(nexe, 'run',
28 ['ppapi_ppb_var.html', 28 ['ppapi_ppb_var.html',
29 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' 29 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
30 'browserdata/nacltest.js')]) 30 'browserdata/nacltest.js')])
31 31
32 node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out', 32 node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out',
33 url='ppapi_ppb_var.html', 33 url='ppapi_ppb_var.html',
34 nmf_names=['ppapi_ppb_var'], 34 nmf_names=['ppapi_ppb_var'],
35 files=env.ExtractPublishedFiles(nexe)) 35 files=env.ExtractPublishedFiles(nexe))
36 36
37 # TODO(ncbray) Flaky on Win XP. Fix. 37 # TODO(ncbray) Flaky on Win XP. Fix.
38 # http://code.google.com/p/nativeclient/issues/detail?id=2124 38 # http://code.google.com/p/nativeclient/issues/detail?id=2124
39 env.AddNodeToTestSuite(node, 39 env.AddNodeToTestSuite(node,
40 ['chrome_browser_tests'], 40 ['chrome_browser_tests'],
41 'run_ppapi_ppb_var_browser_test', 41 'run_ppapi_ppb_var_browser_test',
42 is_broken=env.PPAPIBrowserTesterIsBroken() or True) 42 is_broken=env.PPAPIBrowserTesterIsBroken() or True)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698