ppapi/native_client/tests/ppapi_browser/ppb_graphics2d/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_graphics2d/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_file_system/nacl.scons ('k') | ppapi/native_client/tests/ppapi_browser/ppb_graphics3d/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_graphics2d')

13	11

14 nexe = 'ppapi_ppb_graphics2d_${TARGET_FULLARCH}'	12 nexe = 'ppapi_ppb_graphics2d_${TARGET_FULLARCH}'

15 env.Alias('ppapi_ppb_graphics2d${PROGSUFFIX}',	13 env.Alias('ppapi_ppb_graphics2d${PROGSUFFIX}',

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

17	15

18 ppapi_ppb_graphics2d_nexe = env.ComponentProgram(	16 ppapi_ppb_graphics2d_nexe = env.ComponentProgram(

19 nexe,	17 nexe,

20 [ 'ppapi_ppb_graphics2d.cc' ],	18 [ 'ppapi_ppb_graphics2d.cc' ],

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

22 'ppapi_test_lib',	20 'ppapi_test_lib',

23 'platform', # for CHECK	21 'platform', # for CHECK

24 'pthread',	22 'pthread',

25 'gio',	23 'gio',

26 ])	24 ])

27	25

28 dest_copy = env.Publish(nexe, 'run',	26 dest_copy = env.Publish(nexe, 'run',

29 [ 'ppapi_ppb_graphics2d.html',	27 [ 'ppapi_ppb_graphics2d.html',

	28 'ppapi_ppb_graphics2d.nmf',

30 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'	29 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'

31 'browserdata/nacltest.js') ]	30 'browserdata/nacltest.js') ]

32 )	31 )

33	32

34 node = env.PPAPIBrowserTester('ppapi_ppb_graphics2d_browser_test.out',	33 node = env.PPAPIBrowserTester('ppapi_ppb_graphics2d_browser_test.out',

35 url='ppapi_ppb_graphics2d.html',	34 url='ppapi_ppb_graphics2d.html',

36 nmf='${TEST_DIR}/ppapi_ppb_graphics2d.nmf',

37 files=[ ppapi_ppb_graphics2d_nexe,	35 files=[ ppapi_ppb_graphics2d_nexe,

	36 env.File('ppapi_ppb_graphics2d.nmf'),

38 env.File('ppapi_ppb_graphics2d.html')],	37 env.File('ppapi_ppb_graphics2d.html')],

39 browser_flags=['--enable-pepper-testing'])	38 browser_flags=['--enable-pepper-testing'])

40	39

41 env.AddNodeToTestSuite(node,	40 env.AddNodeToTestSuite(node,

42 ['chrome_browser_tests'],	41 ['chrome_browser_tests'],

43 'run_ppapi_ppb_graphics2d_browser_test',	42 'run_ppapi_ppb_graphics2d_browser_test',

44 is_broken=env.PPAPIBrowserTesterIsBroken())	43 is_broken=env.PPAPIBrowserTesterIsBroken())

OLD	NEW