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

Side by Side Diff: ppapi/native_client/tests/ppapi_example_gles2/nacl.scons

Issue 7778012: 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 is a Pepper 3D (OpenGLES2) example from ppapi/examples/gles2. 6 # This is a Pepper 3D (OpenGLES2) example from ppapi/examples/gles2.
7 7
8 Import('env') 8 Import('env')
9 9
10 env.Prepend(CPPDEFINES=['XP_UNIX']) 10 env.Prepend(CPPDEFINES=['XP_UNIX'])
11
12 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include']) 11 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
12 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
13 'ppapi_example_gles2/')
13 14
14 nexe_name = 'ppapi_example_gles2_%s' % env.get('TARGET_FULLARCH') 15 nexe_name = 'ppapi_example_gles2_%s' % env.get('TARGET_FULLARCH')
15 obj = env.ComponentObject( 16 obj = env.ComponentObject(
16 'gles2', 17 'gles2',
17 '$SOURCE_ROOT/ppapi/examples/gles2/gles2.cc' 18 '$SOURCE_ROOT/ppapi/examples/gles2/gles2.cc'
18 ) 19 )
19 nexe = env.ComponentProgram(nexe_name, [obj], 20 nexe = env.ComponentProgram(nexe_name, [obj],
20 EXTRA_LIBS=['${PPAPI_LIBS}', 'ppapi_cpp']) 21 EXTRA_LIBS=['${PPAPI_LIBS}', 'ppapi_cpp'])
21 22
22 # Note that the html is required to run this program. 23 # Note that the html is required to run this program.
23 env.Publish(nexe_name, 'run', 24 env.Publish(nexe_name, 'run',
24 ['ppapi_example_gles2.html', 'ppapi_example_gles2.nmf']) 25 ['ppapi_example_gles2.html'])
25 26
26 test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out', 27 test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out',
27 url='ppapi_example_gles2.html', 28 url='ppapi_example_gles2.html',
29 nmf='${TEST_DIR}/ppapi_example_gles2.nmf',
28 files=env.ExtractPublishedFiles(nexe_name), 30 files=env.ExtractPublishedFiles(nexe_name),
29 args=['--enable_experimental_js']) 31 args=['--enable_experimental_js'])
30 32
31 env.AddNodeToTestSuite(test, 33 env.AddNodeToTestSuite(test,
32 ['chrome_browser_tests'], 34 ['chrome_browser_tests'],
33 'run_ppapi_example_gles2_test', 35 'run_ppapi_example_gles2_test',
34 # TODO(cstefansen): When fixed set to 36 # TODO(cstefansen): When fixed set to
35 # env.PPAPIBrowserTesterIsBroken(). 37 # env.PPAPIBrowserTesterIsBroken().
36 # code.google.com/p/nativeclient/issues/detail?id=1936 38 # code.google.com/p/nativeclient/issues/detail?id=1936
37 is_broken=True) 39 is_broken=env.Bit('nacl_glibc'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698