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

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

Issue 7736016: Revert 98616 - Landing chrome side of nacl change pre-dating ppapi switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 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/' +
12 'ppb_var')
13 11
14 nexe = 'ppapi_ppb_var_%s' % env.get('TARGET_FULLARCH') 12 nexe = 'ppapi_ppb_var_%s' % env.get('TARGET_FULLARCH')
15 env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) 13 env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
16 14
17 env.ComponentProgram( 15 env.ComponentProgram(
18 nexe, 16 nexe,
19 ['ppapi_ppb_var.cc'], 17 ['ppapi_ppb_var.cc'],
20 EXTRA_LIBS=['${PPAPI_LIBS}', 18 EXTRA_LIBS=['${PPAPI_LIBS}',
21 'ppapi_test_lib', 19 'ppapi_test_lib',
22 'pthread', 20 'pthread',
23 'platform', 21 'platform',
24 'gio']) 22 'gio'])
25 23
26 # Note that the html is required to run this program. 24 # Note that the html is required to run this program.
27 env.Publish(nexe, 'run', 25 env.Publish(nexe, 'run',
28 ['ppapi_ppb_var.html', 26 ['ppapi_ppb_var.html',
27 'ppapi_ppb_var.nmf',
29 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' 28 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
30 'browserdata/nacltest.js')]) 29 'browserdata/nacltest.js')])
31 30
32 node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out', 31 node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out',
33 url='ppapi_ppb_var.html', 32 url='ppapi_ppb_var.html',
34 nmf='${TEST_DIR}/ppapi_ppb_var.nmf',
35 files=env.ExtractPublishedFiles(nexe)) 33 files=env.ExtractPublishedFiles(nexe))
36 34
37 env.AddNodeToTestSuite(node, 35 env.AddNodeToTestSuite(node,
38 ['chrome_browser_tests'], 36 ['chrome_browser_tests'],
39 'run_ppapi_ppb_var_browser_test', 37 'run_ppapi_ppb_var_browser_test',
40 is_broken=env.PPAPIBrowserTesterIsBroken()) 38 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698