diff options
Diffstat (limited to 'ppapi')
5 files changed, 22 insertions, 5 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons index 745fc14..bca20a3 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons @@ -62,6 +62,7 @@ node = env.PPAPIBrowserTester( 'ppapi_bad_browser_test.out', url='ppapi_bad.html', nmf_names=nmf_names, + test_args=[('is_pnacl', int(env.Bit('pnacl_generate_pexe')))], files=[env.File(f) for f in ppapi_bad_files], args=['--allow_404']) diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad.html b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad.html index dc7372c..04deea3 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad.html +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad.html @@ -21,6 +21,16 @@ //<![CDATA[ function declareTests(tester) { + // PNaCl may have slightly different error messages (pexe instead of nexe). + var test_args = getTestArguments({'is_pnacl': '0'}); + var could_not_load_nexe; + if (parseInt(test_args['is_pnacl'])) { + could_not_load_nexe = ( + 'NaCl module load failed: PnaclCoordinator: pexe load failed.'); + } else { + could_not_load_nexe = 'NaCl module load failed: could not load nexe url.'; + } + // 'bad_magic' loads a manifest, then loads a nexe that tests as invalid. badLoadTest( tester, @@ -33,7 +43,7 @@ function declareTests(tester) { tester, 'cross_origin', 'ppapi_bad_crossorigin.nmf', - 'NaCl module load failed: could not load nexe url.'); + could_not_load_nexe); // 'cross_manifest' tries to load a cross-origin manifest. badLoadTest( @@ -48,7 +58,7 @@ function declareTests(tester) { tester, 'nonexistent_nexe', 'ppapi_bad_doesnotexist.nmf', - 'NaCl module load failed: could not load nexe url.'); + could_not_load_nexe); // 'nonexistent_nexe_only' loads a manifest, then tries to load a nonexistent // nexe, given only a nexe to choose from. diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_crossorigin.nmf b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_crossorigin.nmf index 22dba61..a537e73 100644 --- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_crossorigin.nmf +++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_crossorigin.nmf @@ -2,6 +2,8 @@ "program": { "x86-32": {"url": "http://www.google.com/crossorigin.nexe"}, "x86-64": {"url": "http://www.google.com/crossorigin.nexe"}, - "arm": {"url": "http://www.google.com/crossorigin.nexe"} + "arm": {"url": "http://www.google.com/crossorigin.nexe"}, + "portable": {"pnacl-translate": + {"url": "http://www.google.com/crossorigin.pexe"}} } } diff --git a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_subdir.nmf b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_subdir.nmf index 65fd88d..1fa8cf5 100644 --- a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_subdir.nmf +++ b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_subdir.nmf @@ -2,6 +2,8 @@ "program": { "x86-32": {"url": "manifest_good_x86-32.nexe"}, "x86-64": {"url": "manifest_good_x86-64.nexe"}, - "arm": {"url": "manifest_good_arm.nexe"} + "arm": {"url": "manifest_good_arm.nexe"}, + "portable": {"pnacl-translate": + {"url": "manifest_good.pexe"}} } } diff --git a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_top.nmf b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_top.nmf index dcbf573..d5700f6 100644 --- a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_top.nmf +++ b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_top.nmf @@ -2,6 +2,8 @@ "program": { "x86-32": {"url": "subdir/manifest_good_x86-32.nexe"}, "x86-64": {"url": "subdir/manifest_good_x86-64.nexe"}, - "arm": {"url": "subdir/manifest_good_arm.nexe"} + "arm": {"url": "subdir/manifest_good_arm.nexe"}, + "portable": {"pnacl-translate": + {"url": "subdir/manifest_good.pexe"}} } } |