Convert a few more NMF files to be autogenerated and PNaCl

compatible, even though they are currently marked broken for PNaCl.

Bail out for partly_invalid, since:

- that depends on a nexe built from a nacl.scons file in NaCl repo and
- the nexe name doesn't follow the autogenerator's pattern
- and the nacl repo's pyauto expects the .nmf

Can untie those dependencies later...


This will allow use to run ./scons bitcode=1 platform=${arch}
again, without complaints about missing .nexe dependencies
required by the checked-in NMF files, even though we are
generating .pexes.

BUG= http://code.google.com/p/nativeclient/issues/detail?id=2609 
TEST= trybots


Review URL: http://codereview.chromium.org/10166018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133327 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 9 insertions, 53 deletions

diff --git a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
index bca20a3..abd6fa6 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/bad/nacl.scons
@@ -79,6 +79,11 @@ env.AddNodeToTestSuite(node,
 
 # Bad nexe tests that won't work in PNaCl (native)
 # For example, partly_invalid.nexe has inline assembly in its source files.
+# Just bail out here for PNaCl, since the NMF will require the .nexe
+# to be built.
+if env.Bit('bitcode'):
+  Return()
+
 nacltest_js = env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/' +
                        'nacltest.js')
 partly_invalid = env.File('${STAGING_DIR}/partly_invalid${PROGSUFFIX}')
@@ -120,5 +125,4 @@ else:
 env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_ppapi_bad_native_test',
-                       is_broken=env.PPAPIBrowserTesterIsBroken() or
-                                 env.Bit('bitcode'))
+                       is_broken=env.PPAPIBrowserTesterIsBroken())
diff --git a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
index c4cf3e3..608ae68 100644
--- a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
@@ -58,7 +58,8 @@ gles_book_examples = {
 
 for demo, sources in gles_book_examples.iteritems():
     nexe_name = env.ProgramNameForNmf('ppapi_gles_book_%s' % demo)
-    nmf_name = 'ppapi_gles_book_' + demo + '.nmf'
+    nmf_name_base = 'ppapi_gles_book_' + demo
+    nmf_name = nmf_name_base + '.nmf'
     nexe = env.ComponentProgram(
         nexe_name,
         ['demos/gles2_book/demo_' + demo + '.cc'] + sources,
@@ -73,7 +74,7 @@ for demo, sources in gles_book_examples.iteritems():
     test = env.PPAPIBrowserTester(
         'ppapi_gles_book_' + demo + '.out',
         url='ppapi_gles_book.html?manifest=' + nmf_name,
-        nmfs=['${TEST_DIR}/' + nmf_name],
+        nmf_names=[nmf_name_base],
         files=[nexe,
                env.File('ppapi_gles_book.html')],
         browser_flags=['--enable-accelerated-plugins'])
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_hello_triangle.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_hello_triangle.nmf
deleted file mode 100644
index 694d416..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_hello_triangle.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_hello_triangle_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_hello_triangle_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_hello_triangle_arm.nexe"}
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_mip_map_2d.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_mip_map_2d.nmf
deleted file mode 100644
index c0e1357..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_mip_map_2d.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_mip_map_2d_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_mip_map_2d_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_mip_map_2d_arm.nexe"}
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_2d.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_2d.nmf
deleted file mode 100644
index 3f47f1b..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_2d.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_simple_texture_2d_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_simple_texture_2d_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_simple_texture_2d_arm.nexe"}
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_cubemap.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_cubemap.nmf
deleted file mode 100644
index 230ea191..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_cubemap.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_simple_texture_cubemap_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_simple_texture_cubemap_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_simple_texture_cubemap_arm.nexe"}
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_vertex_shader.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_vertex_shader.nmf
deleted file mode 100644
index 12949c7..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_vertex_shader.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_simple_vertex_shader_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_simple_vertex_shader_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_simple_vertex_shader_arm.nexe"}
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_stencil_test.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_stencil_test.nmf
deleted file mode 100644
index 260da7e..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_stencil_test.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_stencil_test_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_stencil_test_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_stencil_test_arm.nexe"}
-  }
-}
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_texture_wrap.nmf b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_texture_wrap.nmf
deleted file mode 100644
index d3f3eb7..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_texture_wrap.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-32": {"url": "ppapi_gles_book_texture_wrap_x86-32.nexe"},
-    "x86-64": {"url": "ppapi_gles_book_texture_wrap_x86-64.nexe"},
-    "arm": {"url": "ppapi_gles_book_texture_wrap_arm.nexe"}
-  }
-}