ppapi/native_client/tests/ppapi_browser/progress_events/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/progress_events/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_instance/nacl.scons ('k') | ppapi/native_client/tests/ppapi_example_audio/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 Import('env')	6 Import('env')

7	7

8 # TODO(robertm): those should not be necessary once we go -std=c99	8 # TODO(robertm): those should not be necessary once we go -std=c99

9 env.FilterOut(CFLAGS=['-pedantic'])	9 env.FilterOut(CFLAGS=['-pedantic'])

10 env.FilterOut(CCFLAGS=['-pedantic'])	10 env.FilterOut(CCFLAGS=['-pedantic'])

11 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +

12 'progress_events')

13	11

14 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'),	12 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'),

15	13

16 progress_events_target = ('ppapi_progress_events_%s' %	14 progress_events_target = ('ppapi_progress_events_%s' %

17 env.get('TARGET_FULLARCH'))	15 env.get('TARGET_FULLARCH'))

18 env.ComponentProgram(progress_events_target,	16 env.ComponentProgram(progress_events_target,

19 [progress_events_sources],	17 [progress_events_sources],

20 EXTRA_LIBS=['${PPAPI_LIBS}',	18 EXTRA_LIBS=['${PPAPI_LIBS}',

21 'ppapi_test_lib',	19 'ppapi_test_lib',

22 'pthread',	20 'pthread',

23 'platform',	21 'platform',

24 'gio'])	22 'gio'])

25	23

26 # Needed by other tests using progress events.	24 # Needed by other tests using progress events.

27 env.Publish(progress_events_target, 'run', [	25 env.Publish(progress_events_target, 'run', [

28 'ppapi_progress_events.html',	26 'ppapi_progress_events.html',

	27 'ppapi_progress_events.nmf',

29 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +	28 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +

30 'ppapi_progress_events.js'),	29 'ppapi_progress_events.js'),

31 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',	30 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',

32 ])	31 ])

33	32

34 node = env.PPAPIBrowserTester(	33 node = env.PPAPIBrowserTester(

35 'ppapi_progress_events_browser_test.out',	34 'ppapi_progress_events_browser_test.out',

36 url='ppapi_progress_events.html',	35 url='ppapi_progress_events.html',

37 nmf='${TEST_DIR}/ppapi_progress_events.nmf',

38 files=env.ExtractPublishedFiles(progress_events_target))	36 files=env.ExtractPublishedFiles(progress_events_target))

39	37

40 env.AddNodeToTestSuite(node,	38 env.AddNodeToTestSuite(node,

41 ['chrome_browser_tests'],	39 ['chrome_browser_tests'],

42 'run_ppapi_progress_events_browser_test',	40 'run_ppapi_progress_events_browser_test',

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

OLD	NEW