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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad.html

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

« ppapi/native_client/src/trusted/plugin/json_manifest.cc ('K') | « ppapi/native_client/src/trusted/plugin/json_manifest.cc ('k') | ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_manifest_bad_files.nmf » ('j') | ppapi/native_client/tests/ppapi_browser/manifest/manifest_arch_specific.nmf » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"	1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">	2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

3 <html>	3 <html>

4 <!--	4 <!--

5 Copyright (c) 2012 The Chromium Authors. All rights reserved.	5 Copyright (c) 2012 The Chromium Authors. All rights reserved.

6 Use of this source code is governed by a BSD-style license that can be	6 Use of this source code is governed by a BSD-style license that can be

7 found in the LICENSE file.	7 found in the LICENSE file.

8 -->	8 -->

9 <head>	9 <head>

10 <META HTTP-EQUIV="Pragma" CONTENT="no-cache" />	10 <META HTTP-EQUIV="Pragma" CONTENT="no-cache" />

(...skipping 85 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
96 'ppapi_bad.html',	96 'ppapi_bad.html',

97 'NaCl module load failed: manifest JSON parsing failed: * Line 1, Column 1 \n Syntax error: value, object or array expected.\n');	97 'NaCl module load failed: manifest JSON parsing failed: * Line 1, Column 1 \n Syntax error: value, object or array expected.\n');

98	98

99 // 'bad_manifest_uses_nexes' loads a manifest with an obsolete 'nexes' section .	99 // 'bad_manifest_uses_nexes' loads a manifest with an obsolete 'nexes' section .

100 badLoadTest(	100 badLoadTest(

101 tester,	101 tester,

102 'bad_manifest_uses_nexes',	102 'bad_manifest_uses_nexes',

103 'ppapi_bad_manifest_uses_nexes.nmf',	103 'ppapi_bad_manifest_uses_nexes.nmf',

104 'NaCl module load failed: manifest: missing \'program\' section.');	104 'NaCl module load failed: manifest: missing \'program\' section.');

105	105

106 // 'bad_manifest_bad_files' loads a manifest with a bad 'files' section.	106 // 'bad_manifest_bad_files' loads a manifest with a bad 'files' section.
	Mark Seaborn 2013/04/18 01:17:46 Isn't the purpose of this test to test for the req Isn't the purpose of this test to test for the requirement that you're removing? Could you explain more about how you're updating the tests? halyavin 2013/04/18 07:33:27 Not quite. It is tests for bad 'files' section. Si Show quoted text On 2013/04/18 01:17:46, Mark Seaborn wrote: > Isn't the purpose of this test to test for the requirement that you're removing? Not quite. It is tests for bad 'files' section. Since not having current arch is no more an error, I used a different error in 'files' section for this test. In order to test a positive case, I added one more 'good' test. It has a file that is not available for any architectures. Mark Seaborn 2013/04/19 05:36:43 OK, please add a note to the commit message explai Show quoted text On 2013/04/18 07:33:27, halyavin wrote: > On 2013/04/18 01:17:46, Mark Seaborn wrote: > > Isn't the purpose of this test to test for the requirement that you're > removing? > Not quite. It is tests for bad 'files' section. Since not having current arch is > no more an error, I used a different error in 'files' section for this test. OK, please add a note to the commit message explaining that. halyavin 2013/04/19 06:41:51 Done. Show quoted text On 2013/04/19 05:36:43, Mark Seaborn wrote: > On 2013/04/18 07:33:27, halyavin wrote: > > On 2013/04/18 01:17:46, Mark Seaborn wrote: > > > Isn't the purpose of this test to test for the requirement that you're > > removing? > > Not quite. It is tests for bad 'files' section. Since not having current arch > is > > no more an error, I used a different error in 'files' section for this test. > > OK, please add a note to the commit message explaining that. Done.
107 badLoadTest(	107 badLoadTest(

108 tester,	108 tester,

109 'bad_manifest_bad_files',	109 'bad_manifest_bad_files',

110 'ppapi_bad_manifest_bad_files.nmf',	110 'ppapi_bad_manifest_bad_files.nmf',

111 'NaCl module load failed: manifest: no version of file.txt given for curre nt arch and no portable version found.');	111 'NaCl module load failed: manifiest: file.txt property \'unknown_arch\' do es not have required key: \'pnacl-translate\'.');
	Mark Seaborn 2013/04/18 01:17:46 "manifiest" -> "manifest". This seems to be a typ "manifiest" -> "manifest". This seems to be a typo in the source before your change. Would you mind fixing it? I'm not sure why you should expect to get an error about "pnacl-translate" here? halyavin 2013/04/18 07:33:27 Done. Show quoted text On 2013/04/18 01:17:46, Mark Seaborn wrote: > "manifiest" -> "manifest". This seems to be a typo in the source before your > change. Would you mind fixing it? Done. Show quoted text > > I'm not sure why you should expect to get an error about "pnacl-translate" here? The code looks for 2 keys: 'url' and 'pnacl-translate'. If neither is found it complains about the last one.
112	112

113 // 'bad_manifest_nexe_arch' loads a manifest with no program entry for the	113 // 'bad_manifest_nexe_arch' loads a manifest with no program entry for the

114 // user's architecture	114 // user's architecture

115 badLoadTest(	115 badLoadTest(

116 tester,	116 tester,

117 'bad_manifest_nexe_arch',	117 'bad_manifest_nexe_arch',

118 'ppapi_bad_manifest_nexe_arch.nmf',	118 'ppapi_bad_manifest_nexe_arch.nmf',

119 'NaCl module load failed: manifest: no version of program given for curren t arch and no portable version found.');	119 'NaCl module load failed: manifest: no version of program given for curren t arch and no portable version found.');

120	120

121 //////////////////////////////////////	121 //////////////////////////////////////

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
215 style="background-color:gray"	215 style="background-color:gray"

216 type="application/pdf" />	216 type="application/pdf" />

217	217

218 <script type="text/javascript">	218 <script type="text/javascript">

219 //<![CDATA[	219 //<![CDATA[

220 runTests();	220 runTests();

221 //]]>	221 //]]>

222 </script>	222 </script>

223 </body>	223 </body>

224 </html>	224 </html>

OLD	NEW