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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/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', 'GL_GLEXT_PROTOTYPES']) 10 env.Prepend(CPPDEFINES=['XP_UNIX', 'GL_GLEXT_PROTOTYPES'])
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_graphics3d') 12 'ppb_graphics3d')
13 13
14 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include']) 14 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
15 15
16 nexe = env.ProgramNameForNmf('ppapi_ppb_graphics3d') 16 nexe = env.ProgramNameForNmf('ppapi_ppb_graphics3d')
17 env.Alias('ppapi_ppb_graphics3d${PROGSUFFIX}', 17 env.Alias('ppapi_ppb_graphics3d${PROGSUFFIX}',
18 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe]) 18 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
19 19
20 ppapi_ppb_graphics3d_nexe = env.ComponentProgram( 20 ppapi_ppb_graphics3d_nexe = env.ComponentProgram(
21 nexe, 21 nexe,
22 [ 'ppapi_ppb_graphics3d.cc' ], 22 [ 'ppapi_ppb_graphics3d.cc' ],
23 EXTRA_LIBS=['${PPAPI_LIBS}', 23 EXTRA_LIBS=['ppapi',
24 'ppapi_gles2', 24 'ppapi_gles2',
25 'ppapi_test_lib', 25 'ppapi_test_lib',
26 'platform', # for CHECK 26 'platform', # for CHECK
27 'pthread', 27 'pthread',
28 'gio', 28 'gio',
29 ]) 29 ])
30 30
31 dest_copy = env.Publish(nexe, 'run', 31 dest_copy = env.Publish(nexe, 'run',
32 [ 'ppapi_ppb_graphics3d.html', 32 [ 'ppapi_ppb_graphics3d.html',
33 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/' 33 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
34 'browserdata/nacltest.js') ]) 34 'browserdata/nacltest.js') ])
35 35
36 node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out', 36 node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out',
37 url='ppapi_ppb_graphics3d.html', 37 url='ppapi_ppb_graphics3d.html',
38 nmf_names=['ppapi_ppb_graphics3d'], 38 nmf_names=['ppapi_ppb_graphics3d'],
39 files=[ ppapi_ppb_graphics3d_nexe, 39 files=[ ppapi_ppb_graphics3d_nexe,
40 env.File('ppapi_ppb_graphics3d.html')], 40 env.File('ppapi_ppb_graphics3d.html')],
41 browser_flags=['--enable-accelerated-plugins']) 41 browser_flags=['--enable-accelerated-plugins'])
42 42
43 env.AddNodeToTestSuite(node, 43 env.AddNodeToTestSuite(node,
44 ['chrome_browser_tests'], 44 ['chrome_browser_tests'],
45 'run_ppapi_ppb_graphics3d_browser_test', 45 'run_ppapi_ppb_graphics3d_browser_test',
46 is_broken=env.PPAPIBrowserTesterIsBroken() or 46 is_broken=env.PPAPIBrowserTesterIsBroken() or
47 env.PPAPIGraphics3DIsBroken()) 47 env.PPAPIGraphics3DIsBroken())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698