ppapi/native_client/tests/ppapi_browser/ppb_url_loader/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_url_loader/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_scrollbar/nacl.scons ('k') | ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/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_url_loader')

13	11

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

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

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

17	15

18 env.ComponentProgram(nexe,	16 env.ComponentProgram(nexe,

19 ['ppapi_ppb_url_loader.cc'],	17 ['ppapi_ppb_url_loader.cc'],

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

21 'ppapi_test_lib',	19 'ppapi_test_lib',

22 'platform',	20 'platform',

23 'pthread',	21 'pthread',

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

25	23

26 env.Publish(nexe, 'run',	24 env.Publish(nexe, 'run',

27 ['ppapi_ppb_url_loader.html',	25 ['ppapi_ppb_url_loader.html',

	26 'ppapi_ppb_url_loader.nmf',

28 'ppapi_ppb_url_loader.js',	27 'ppapi_ppb_url_loader.js',

29 'ppapi_ppb_url_loader.txt'])	28 'ppapi_ppb_url_loader.txt'])

30	29

31 node = env.PPAPIBrowserTester('ppapi_ppb_url_loader_browser_test.out',	30 node = env.PPAPIBrowserTester('ppapi_ppb_url_loader_browser_test.out',

32 url='ppapi_ppb_url_loader.html',	31 url='ppapi_ppb_url_loader.html',

33 nmf='${TEST_DIR}/ppapi_ppb_url_loader.nmf',

34 files=env.ExtractPublishedFiles(nexe),	32 files=env.ExtractPublishedFiles(nexe),

35 args=['--allow_404',	33 args=['--allow_404',

36 '--redirect_url',	34 '--redirect_url',

37 '/redirect-to-existing.txt',	35 '/redirect-to-existing.txt',

38 '/ppapi_ppb_url_loader.txt'],	36 '/ppapi_ppb_url_loader.txt'],

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

40	38

41 env.AddNodeToTestSuite(node,	39 env.AddNodeToTestSuite(node,

42 ['chrome_browser_tests'],	40 ['chrome_browser_tests'],

43 'run_ppapi_ppb_url_loader_browser_test',	41 'run_ppapi_ppb_url_loader_browser_test',

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

OLD	NEW