tests/manifest_file/nacl.scons - Issue 7745047: Enable browser tests with glibc.

Unified Diff: tests/manifest_file/nacl.scons

Issue 7745047: Enable browser tests with glibc. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/

Patch Set: '' Created 9 years, 4 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 side-by-side diff with in-line comments

Download patch

Index: tests/manifest_file/nacl.scons

===================================================================

--- tests/manifest_file/nacl.scons (revision 6583)

+++ tests/manifest_file/nacl.scons (working copy)

@@ -19,14 +19,14 @@

'${PTHREAD_LIBS}',

'${NON_PPAPI_BROWSER_LIBS}'])

env.Publish(srpc_mf_nexe_name, 'run',

- ['srpc_manifest_file_test.html',

- 'srpc_manifest_file.nmf'])

+ ['srpc_manifest_file_test.html', 'test_file.txt'])

# chrome_browser_tests

node = env.PPAPIBrowserTester(

'srpc_mf_browser_test.out',

url='srpc_manifest_file_test.html',

+ nmfs=['srpc_manifest_file.nmf'],

files=env.ExtractPublishedFiles(srpc_mf_nexe_name),

args=['--debug', '--enable_experimental_js'],

# osenv=['NACLVERBOSITY=4']

@@ -35,7 +35,8 @@

env.AddNodeToTestSuite(node,

['chrome_browser_tests'],

'run_srpc_manifest_file_chrome_browser_test',

- is_broken=env.PPAPIBrowserTesterIsBroken())

+ is_broken=env.PPAPIBrowserTesterIsBroken() or

+ env.Bit('nacl_glibc'))

# post message version

@@ -56,14 +57,14 @@

'imc_syscalls',

])

env.Publish(pm_mf_nexe_name, 'run',

- ['pm_manifest_file_test.html',

- 'pm_manifest_file.nmf'])

+ ['pm_manifest_file_test.html', 'test_file.txt'])

# chrome_browser_tests

node = env.PPAPIBrowserTester(

'pm_mf_browser_test.out',

url='pm_manifest_file_test.html',

+ nmfs=['pm_manifest_file.nmf'],

files=env.ExtractPublishedFiles(pm_mf_nexe_name),

args=['--debug'],

# osenv=['NACLVERBOSITY=4,pp_weak_ref=4,weak_ref=4']

@@ -72,7 +73,8 @@

env.AddNodeToTestSuite(node,

['chrome_browser_tests'],

'run_pm_manifest_file_chrome_browser_test',

- is_broken=env.PPAPIBrowserTesterIsBroken())

+ is_broken=env.PPAPIBrowserTesterIsBroken() or

+ env.Bit('nacl_glibc'))

# post message, pre-init version

@@ -95,14 +97,14 @@

'imc_syscalls',

])

env.Publish(pm_pi_mf_nexe_name, 'run',

- ['pm_pre_init_manifest_file_test.html',

- 'pm_pre_init_manifest_file.nmf'])

+ ['pm_pre_init_manifest_file_test.html', 'test_file.txt'])

# chrome_browser_tests

node = env.PPAPIBrowserTester(

'pm_pi_mf_browser_test.out',

url='pm_pre_init_manifest_file_test.html',

+ nmfs=['pm_pre_init_manifest_file.nmf'],

files=env.ExtractPublishedFiles(pm_pi_mf_nexe_name),

args=['--debug'],

# osenv=['NACLVERBOSITY=4,pp_weak_ref=4,weak_ref=4']

@@ -112,7 +114,8 @@

env.AddNodeToTestSuite(node,

['chrome_browser_tests'],

'run_pm_pi_manifest_file_chrome_browser_test',

- is_broken=env.PPAPIBrowserTesterIsBroken())

+ is_broken=env.PPAPIBrowserTesterIsBroken() or

+ env.Bit('nacl_glibc'))

else:

# This test cannot be built under irt=0 because it uses __nacl_irt_query,

# which is not available in the private libraries.

@@ -132,15 +135,16 @@

'nacl',

])

env.Publish(irt_mf_nexe_name, 'run',

- ['irt_manifest_file_test.html',

- 'irt_manifest_file.nmf'])

+ ['irt_manifest_file_test.html', 'test_file.txt'])

node = env.PPAPIBrowserTester(

'irt_mf_browser_test.out',

url='irt_manifest_file_test.html',

+ nmfs=['irt_manifest_file.nmf'],

files=env.ExtractPublishedFiles(irt_mf_nexe_name),

args=['--debug'],

)

env.AddNodeToTestSuite(node,

['chrome_browser_tests'],

'run_irt_manifest_file_chrome_browser_test',

- is_broken=env.PPAPIBrowserTesterIsBroken())

+ is_broken=env.PPAPIBrowserTesterIsBroken() or

+ env.Bit('nacl_glibc'))

« no previous file with comments | « tests/manifest_file/irt_manifest_file_test.html ('k') | tests/manifest_file/pm_manifest_file.nmf » ('j') | no next file with comments »