ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons - Issue 7736016: Revert 98616 - Landing chrome side of nacl change pre-dating ppapi switch.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/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

« no previous file with comments | « ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons ('k') | ppapi/native_client/tests/ppapi_browser/ppb_image_data/nacl.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_graphics3d')

13	11

14 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])	12 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])

15	13

16 nexe = 'ppapi_ppb_graphics3d_${TARGET_FULLARCH}'	14 nexe = 'ppapi_ppb_graphics3d_${TARGET_FULLARCH}'

17 env.Alias('ppapi_ppb_graphics3d${PROGSUFFIX}',	15 env.Alias('ppapi_ppb_graphics3d${PROGSUFFIX}',

18 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])	16 ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])

19	17

20 ppapi_ppb_graphics3d_nexe = env.ComponentProgram(	18 ppapi_ppb_graphics3d_nexe = env.ComponentProgram(

21 nexe,	19 nexe,

22 [ 'ppapi_ppb_graphics3d.cc' ],	20 [ 'ppapi_ppb_graphics3d.cc' ],

23 EXTRA_LIBS=['${PPAPI_LIBS}',	21 EXTRA_LIBS=['${PPAPI_LIBS}',

24 'ppapi_gles2',	22 'ppapi_gles2',

25 'ppapi_test_lib',	23 'ppapi_test_lib',

26 'platform', # for CHECK	24 'platform', # for CHECK

27 'pthread',	25 'pthread',

28 'gio',	26 'gio',

29 ])	27 ])

30	28

31 dest_copy = env.Publish(nexe, 'run',	29 dest_copy = env.Publish(nexe, 'run',

32 [ 'ppapi_ppb_graphics3d.html',	30 [ 'ppapi_ppb_graphics3d.html',

	31 'ppapi_ppb_graphics3d.nmf',

33 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'	32 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'

34 'browserdata/nacltest.js') ])	33 'browserdata/nacltest.js') ])

35	34

36 node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out',	35 node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out',

37 url='ppapi_ppb_graphics3d.html',	36 url='ppapi_ppb_graphics3d.html',

38 nmf='${TEST_DIR}/ppapi_ppb_graphics3d.nmf',

39 files=[ ppapi_ppb_graphics3d_nexe,	37 files=[ ppapi_ppb_graphics3d_nexe,

	38 env.File('ppapi_ppb_graphics3d.nmf'),

40 env.File('ppapi_ppb_graphics3d.html')],	39 env.File('ppapi_ppb_graphics3d.html')],

41 browser_flags=['--enable-accelerated-plugins'])	40 browser_flags=['--enable-accelerated-plugins'])

42	41

43 env.AddNodeToTestSuite(node,	42 env.AddNodeToTestSuite(node,

44 ['chrome_browser_tests'],	43 ['chrome_browser_tests'],

45 'run_ppapi_ppb_graphics3d_browser_test',	44 'run_ppapi_ppb_graphics3d_browser_test',

46 is_broken=env.PPAPIBrowserTesterIsBroken() or	45 is_broken=env.PPAPIBrowserTesterIsBroken() or

47 env.PPAPIGraphics3DIsBroken())	46 env.PPAPIGraphics3DIsBroken())

OLD	NEW