Restore ppapi_gles example NMF files so that they look more

like a complete example (rather then autogenerate them).
This reverts part of r133327.

Bail out for PNaCl for now, until we turn on these tests.

BUG= none
TEST= trybots

Review URL: https://chromiumcodereview.appspot.com/10191008

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

8 files changed, 58 insertions, 3 deletions

diff --git a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
index 608ae68..8e73806 100644
--- a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
@@ -56,10 +56,16 @@ gles_book_examples = {
         'Chapter_9/TextureWrap/TextureWrap.c'],
 }
 
+# TODO(jvoung): PPAPIGraphics3DIsBroken is currently marked True.
+# When we turn on these tests again, be sure to convert these
+# NMF files to work with PNaCl (have a portable-only version).
+# For now, we just avoid adding them to a test suite.
+if env.Bit('bitcode'):
+  Return()
+
 for demo, sources in gles_book_examples.iteritems():
     nexe_name = env.ProgramNameForNmf('ppapi_gles_book_%s' % demo)
-    nmf_name_base = 'ppapi_gles_book_' + demo
-    nmf_name = nmf_name_base + '.nmf'
+    nmf_name = 'ppapi_gles_book_' + demo + '.nmf'
     nexe = env.ComponentProgram(
         nexe_name,
         ['demos/gles2_book/demo_' + demo + '.cc'] + sources,
@@ -74,7 +80,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,
-        nmf_names=[nmf_name_base],
+        nmfs=['${TEST_DIR}/' + nmf_name],
         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
new file mode 100644
index 0000000..694d416
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_hello_triangle.nmf
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 0000000..c0e1357
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_mip_map_2d.nmf
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 0000000..3f47f1b
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_2d.nmf
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 0000000..230ea191
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_cubemap.nmf
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 0000000..12949c7
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_vertex_shader.nmf
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 0000000..260da7e
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_stencil_test.nmf
@@ -0,0 +1,7 @@
+{
+  "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
new file mode 100644
index 0000000..d3f3eb7
--- /dev/null
+++ b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_texture_wrap.nmf
@@ -0,0 +1,7 @@
+{
+  "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"}
+  }
+}