summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client/tests/ppapi_gles_book
diff options
context:
space:
mode:
authorncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 22:39:22 +0000
committerncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-11 22:39:22 +0000
commitb170daf3f5ce4572e86d1fb716a6e68b27c1b550 (patch)
tree2385e455c7372029342bcee2a13fa6d7fc79893d /ppapi/native_client/tests/ppapi_gles_book
parent47ca854e3b4c437a61988ecfdd1f601c753e9f77 (diff)
downloadchromium_src-b170daf3f5ce4572e86d1fb716a6e68b27c1b550.zip
chromium_src-b170daf3f5ce4572e86d1fb716a6e68b27c1b550.tar.gz
chromium_src-b170daf3f5ce4572e86d1fb716a6e68b27c1b550.tar.bz2
Remove PPAPI tests from NaCl's SCons build that are not automated or are dead.
BUG= http://code.google.com/p/chromium/issues/detail?id=154400 Review URL: https://chromiumcodereview.appspot.com/11088017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client/tests/ppapi_gles_book')
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/nacl.scons92
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html101
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_hello_triangle.nmf7
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_mip_map_2d.nmf7
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_2d.nmf7
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_texture_cubemap.nmf7
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_simple_vertex_shader.nmf7
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_stencil_test.nmf7
-rw-r--r--ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book_texture_wrap.nmf7
9 files changed, 0 insertions, 242 deletions
diff --git a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons b/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
deleted file mode 100644
index 02d6422..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/nacl.scons
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- python -*-
-# Copyright 2012 The Native Client Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can
-# be found in the LICENSE file.
-
-# OpenGL ES examples
-
-Import('env')
-
-env.Prepend(CPPDEFINES=['XP_UNIX', 'GL_GLEXT_PROTOTYPES'])
-env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
- 'ppapi_gles_book/')
-
-# Underlay $SOURCE_ROOT/gpu in this directory.
-Dir('.').addRepository(Dir('#/../gpu'))
-
-# Underlay $SOURCE_ROOT/third_party/gles2_book in this directory.
-Dir('.').addRepository(Dir('#/../third_party/gles2_book'))
-
-# Don't warn on pointer signedness issues (third_party sources)
-env.Append(CFLAGS=['-Wno-pointer-sign'])
-# ..and don't warn about missing braces
-env.Append(CCFLAGS=['-Wno-missing-braces'])
-
-# Add local path to find GPU sources and GLES2 includes.
-env.Append(CPPPATH=[
- '$SOURCE_ROOT/third_party/gles2_book/Common/Include',
- '$SOURCE_ROOT/ppapi/lib/gl/include',
- ])
-
-gles_demo_srcs = [
- 'Common/Source/esShader.c',
- 'Common/Source/esShapes.c',
- 'Common/Source/esTransform.c',
- 'Common/Source/esUtil.c',
- 'demos/framework/demo.cc',
- 'demos/framework/pepper.cc',
- ]
-
-env.ComponentLibrary('ppapi_gles_demo', gles_demo_srcs)
-
-gles_book_examples = {
- 'hello_triangle': [
- 'Chapter_2/Hello_Triangle/Hello_Triangle.c'],
- 'mip_map_2d': [
- 'Chapter_9/MipMap2D/MipMap2D.c'],
- 'simple_texture_2d': [
- 'Chapter_9/Simple_Texture2D/Simple_Texture2D.c'],
- 'simple_texture_cubemap': [
- 'Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c'],
- 'simple_vertex_shader': [
- 'Chapter_8/Simple_VertexShader/Simple_VertexShader.c'],
- 'stencil_test': [
- 'Chapter_11/Stencil_Test/Stencil_Test.c'],
- 'texture_wrap': [
- '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 = 'ppapi_gles_book_' + demo + '.nmf'
- nexe = env.ComponentProgram(
- nexe_name,
- ['demos/gles2_book/demo_' + demo + '.cc'] + sources,
- EXTRA_LIBS=['ppapi',
- 'ppapi_cpp',
- 'ppapi_gles_demo',
- 'ppapi_cpp',
- 'ppapi_gles2',
- 'm'])
- env.Publish(nexe_name, 'run',
- ['ppapi_gles_book.html'])
- test = env.PPAPIBrowserTester(
- 'ppapi_gles_book_' + demo + '.out',
- url='ppapi_gles_book.html?manifest=' + nmf_name,
- nmfs=['${TEST_DIR}/' + nmf_name],
- files=[nexe,
- env.File('ppapi_gles_book.html')],
- browser_flags=['--enable-accelerated-plugins'])
- env.AddNodeToTestSuite(
- test,
- ['chrome_browser_tests'],
- 'run_ppapi_gles_book_' + demo + '_test',
- is_broken=env.PPAPIBrowserTesterIsBroken() or
- env.PPAPIGraphics3DIsBroken())
diff --git a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html b/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html
deleted file mode 100644
index 71dc99c..0000000
--- a/ppapi/native_client/tests/ppapi_gles_book/ppapi_gles_book.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- Copyright (c) 2012 The Chromium Authors. All rights reserved.
- Use of this source code is governed by a BSD-style license that can
- be found in the LICENSE file.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
- <head>
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Expires" content="-1" />
- <script type="text/javascript" src="nacltest.js"></script>
- <title>PPAPI OpenGL ES Book Examples</title>
- </head>
-
- <body>
- <h1>PPAPI OpenGL ES Book Examples</h1>
- <table style="border-spacing: 20pt;" summary="List of GLES book tests">
- <tr style="vertical-align: top;">
- <td>
- <h2>Examples available and expected output</h2>
- <p><a href="?manifest=ppapi_gles_book_hello_triangle.nmf">
- hello_triangle</a>
- Red triangle</p>
- <p><a href="?manifest=ppapi_gles_book_mip_map_2d.nmf">mip_map_2d</a>
- Two red/blue chess board-patterned planes</p>
- <p><a href="?manifest=ppapi_gles_book_simple_texture_2d.nmf">
- simple_texture_2d</a>
- 2x2 matrix with red, green, blue, and yellow squares</p>
- <p><a href="?manifest=ppapi_gles_book_simple_texture_cubemap.nmf">
- simple_texture_cubemap</a>
- Ball with blue, red, yellow, and green patches; purple in the
- center.</p>
- <p><a href="?manifest=ppapi_gles_book_simple_vertex_shader.nmf">
- simple_vertex_shader</a>
- Rotating red square</p>
- <p><a href="?manifest=ppapi_gles_book_stencil_test.nmf">stencil_test</a>
- EXPECTED OUTPUT UNKNOWN</p>
- <p><a href="?manifest=ppapi_gles_book_texture_wrap.nmf">texture_wrap</a>
- Three blue/red patterns</p>
- <h2>Troubleshooting</h2>
- <p>Make sure you start Chrome with
- <tt>--enable-accelerated-plugins</tt>.</p>
- <p>Check the JavaScript console.</p>
- </td>
- <td>
- <div id="attach" style="background-image:
- url(http://www.google.com/intl/en_ALL/images/logo.gif);
- background-repeat:repeat"></div>
- </td>
- </tr>
- </table>
-
- <script type="text/javascript">
- //<![CDATA[
-function ExtractSearchParameter(name) {
- var nameIndex = location.search.indexOf(name + '=');
- if (nameIndex != -1) {
- var value = location.search.substring(nameIndex + name.length + 1);
- var endIndex = value.indexOf('&');
- if (endIndex != -1)
- value = value.substring(0, endIndex);
- return value;
- }
- return '';
-}
-
-function setupTests(tester, plugin) {
- // This template is built for tests where we only need to (or can)
- // verify that the nexe loaded successfully. We do this by inserting
- // following dummy test.
- // This only tests that loading and any start-up testing (typically
- // within DidChangeView) returned success; there is no
- // automated way of checking that it did as intended beyond that.
- tester.addAsyncTest('DummyTestToEnsureLoadingComplete_' + manifest,
- function(status) { status.pass(); });
-}
-
-var manifest = ExtractSearchParameter('manifest');
-if (!manifest) manifest = 'ppapi_gles_book_hello_triangle.nmf';
-document.title = 'Test ' + manifest;
-
-var node = document.createElement('div');
-node.innerHTML = '<embed id="naclModule" ' +
- 'name="naclModule" ' +
- 'width=400 height=400 ' +
- 'src="' + manifest + '" ' +
- 'basic_tests="1" ' +
- 'stress_tests="0" ' +
- 'type="application/x-nacl" ' +
- ' />';
-document.getElementById('attach').appendChild(node);
-
-var tester = new Tester();
-setupTests(tester, $('naclModule'));
-tester.waitFor($('naclModule'));
-tester.run();
- //]]>
- </script>
- </body>
-</html>
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"}
- }
-}