ppapi/native_client/tests/ppapi_browser/ppp_instance/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/ppp_instance/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/ppp_input_event/nacl.scons ('k') | ppapi/native_client/tests/ppapi_browser/progress_events/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 'ppp_instance')

13	11

14 nexe = 'ppapi_ppp_instance_%s' % env.get('TARGET_FULLARCH')	12 nexe = 'ppapi_ppp_instance_%s' % env.get('TARGET_FULLARCH')

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

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

17	15

18 ppapi_ppp_instance_nexe = env.ComponentProgram(	16 ppapi_ppp_instance_nexe = env.ComponentProgram(

19 nexe,	17 nexe,

20 ['ppapi_ppp_instance.cc'],	18 ['ppapi_ppp_instance.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 env.Publish(nexe, 'run',	26 env.Publish(nexe, 'run',

29 ['ppapi_ppp_instance.html',	27 ['ppapi_ppp_instance.html',

	28 'ppapi_ppp_instance.nmf',

30 'ppapi_ppp_instance.js'])	29 'ppapi_ppp_instance.js'])

31	30

32 node = env.PPAPIBrowserTester('ppapi_ppp_instance_browser_test.out',	31 node = env.PPAPIBrowserTester('ppapi_ppp_instance_browser_test.out',

33 url='ppapi_ppp_instance.html',	32 url='ppapi_ppp_instance.html',

34 nmf='${TEST_DIR}/ppapi_ppp_instance.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_ppp_instance_browser_test',	37 'run_ppapi_ppp_instance_browser_test',

40 is_broken=env.PPAPIBrowserTesterIsBroken())	38 is_broken=env.PPAPIBrowserTesterIsBroken())

OLD	NEW