summaryrefslogtreecommitdiffstats
path: root/chrome/test/data
diff options
context:
space:
mode:
authorjvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-20 06:36:38 +0000
committerjvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-20 06:36:38 +0000
commit72f8ea4b1f412c3f5d842bfd39f2912a941c6958 (patch)
treeb38b1bba87f57f8f84e81e18d66f736561c841df /chrome/test/data
parent98e79004ee2d49ee82d6599b025ca40a929762d7 (diff)
downloadchromium_src-72f8ea4b1f412c3f5d842bfd39f2912a941c6958.zip
chromium_src-72f8ea4b1f412c3f5d842bfd39f2912a941c6958.tar.gz
chromium_src-72f8ea4b1f412c3f5d842bfd39f2912a941c6958.tar.bz2
Change PNaCl NMF parser to accept "optlevel" instead of "-O" and change default.
Change default optlevel from 0 to "unknown" (which is actually the pnacl-llc default aka -O2). Change key from "-O" to "optlevel". This makes the NMF file look less like it's specifying commandline flags and doesn't stick out as much. Also, emit an error which tells people what to change, if a legacy NMF file is encountered. BUG=http://code.google.com/p/nativeclient/issues/detail?id=3553 Review URL: https://chromiumcodereview.appspot.com/19851002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
-rw-r--r--chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_0.nmf2
-rw-r--r--chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_2.nmf2
-rw-r--r--chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_large.nmf2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_0.nmf b/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_0.nmf
index d8c6e4a..e1322bb 100644
--- a/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_0.nmf
+++ b/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_0.nmf
@@ -2,7 +2,7 @@
"program": {
"portable": {
"pnacl-translate": {
- "-O": 0,
+ "optlevel": 0,
"url": "pnacl_options_newlib_pnacl.pexe"
}
}
diff --git a/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_2.nmf b/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_2.nmf
index 59d8c34..650983e 100644
--- a/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_2.nmf
+++ b/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_2.nmf
@@ -2,7 +2,7 @@
"program": {
"portable": {
"pnacl-translate": {
- "-O": 2,
+ "optlevel": 2,
"url": "pnacl_options_newlib_pnacl.pexe"
}
}
diff --git a/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_large.nmf b/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_large.nmf
index 9dfb0c6..65cf918 100644
--- a/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_large.nmf
+++ b/chrome/test/data/nacl/pnacl_nmf_options/pnacl_o_large.nmf
@@ -2,7 +2,7 @@
"program": {
"portable": {
"pnacl-translate": {
- "-O": 257,
+ "optlevel": 257,
"url": "pnacl_options_newlib_pnacl.pexe"
}
}