ppapi/native_client/tests/ppapi_browser/manifest/nacl.scons - Issue 14069002: Allow to have different files for different ISAs in NaCl manifest.

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/manifest/nacl.scons

Issue 14069002: Allow to have different files for different ISAs in NaCl manifest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 8 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

OLD	NEW
1 # -- python --	1 # -- python --

2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.	2 # Copyright (c) 2012 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'])

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 # the 'good' nexe in the root directory will fail.	50 # the 'good' nexe in the root directory will fail.

51 (manifest_good_target + env['PROGSUFFIX'],	51 (manifest_good_target + env['PROGSUFFIX'],

52 env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),	52 env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),

53 # the 'good' nexe in the subdirectory will succeed.	53 # the 'good' nexe in the subdirectory will succeed.

54 ('subdir/' + manifest_good_target + env['PROGSUFFIX'],	54 ('subdir/' + manifest_good_target + env['PROGSUFFIX'],

55 env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))]	55 env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))]

56	56

57 node = env.PPAPIBrowserTester(	57 node = env.PPAPIBrowserTester(

58 'manifest_browser_test.out',	58 'manifest_browser_test.out',

59 url='manifest.html',	59 url='manifest.html',

60 nmfs=['${TEST_DIR}/manifest_top.nmf', '${TEST_DIR}/manifest_subdir.nmf'],	60 nmfs=['${TEST_DIR}/manifest_top.nmf',

	61 '${TEST_DIR}/manifest_subdir.nmf',

	62 '${TEST_DIR}/manifest_arch_specific.nmf'],

61 files=env.ExtractPublishedFiles(manifest_good_target),	63 files=env.ExtractPublishedFiles(manifest_good_target),

62 map_files=file_mapping)	64 map_files=file_mapping)

63	65

64 env.AddNodeToTestSuite(node,	66 env.AddNodeToTestSuite(node,

65 ['chrome_browser_tests'],	67 ['chrome_browser_tests'],

66 'run_manifest_browser_test',	68 'run_manifest_browser_test',

67 is_broken=env.PPAPIBrowserTesterIsBroken())	69 is_broken=env.PPAPIBrowserTesterIsBroken())

OLD	NEW