From 0e7878c00c2a0b35771f1a012fc6c29fb3e320cc Mon Sep 17 00:00:00 2001
From: "gspencer@google.com"
 <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 13 Oct 2009 00:18:36 +0000
Subject: This removes the command buffer tests from the non-command buffer
 builds because they fail with the current version of nacl, and Al is busy
 making command buffer code that doesn't use nacl anyhow. Review URL:
 http://codereview.chromium.org/266057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28765 0039d316-1c4b-4281-b951-d872f2087c98
---
 o3d/command_buffer/command_buffer.gyp | 26 ++++++++++++++------------
 o3d/tests/tests.gyp                   | 12 +++++++++---
 2 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'o3d')

diff --git a/o3d/command_buffer/command_buffer.gyp b/o3d/command_buffer/command_buffer.gyp
index 810ee0f..d6978c3 100644
--- a/o3d/command_buffer/command_buffer.gyp
+++ b/o3d/command_buffer/command_buffer.gyp
@@ -200,6 +200,20 @@
             ],  # 'sources'
           },
         ],
+        ['cb_service != "none"',
+          {
+            'target_name': 'command_buffer_service_test',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'sources': [
+                'service/cross/buffer_rpc_test.cc',
+                'service/cross/cmd_buffer_engine_test.cc',
+                'service/cross/cmd_parser_test.cc',
+                'service/cross/resource_test.cc',
+              ],
+            },
+          },
+        ],
         ['OS == "linux"',
           {
             'sources': [
@@ -210,18 +224,6 @@
         ],
       ],  # 'conditions'
     },
-    {
-      'target_name': 'command_buffer_service_test',
-      'type': 'none',
-      'direct_dependent_settings': {
-        'sources': [
-          'service/cross/buffer_rpc_test.cc',
-          'service/cross/cmd_buffer_engine_test.cc',
-          'service/cross/cmd_parser_test.cc',
-          'service/cross/resource_test.cc',
-        ],
-      },
-    },
   ],  # 'targets'
 }
 
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index 890f729..b32dc5d 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -43,9 +43,6 @@
         '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc',
         '../compiler/technique/technique.gyp:o3dTechnique',
         '../compiler/technique/technique.gyp:o3dTechniqueTest',
-        '../command_buffer/command_buffer.gyp:command_buffer_client_test',
-        '../command_buffer/command_buffer.gyp:command_buffer_common_test',
-        '../command_buffer/command_buffer.gyp:command_buffer_service_test',
         '../core/core.gyp:o3dCore',
         '../core/core.gyp:o3dCorePlatform',
         '../core/core.gyp:o3dCoreTest',
@@ -217,6 +214,15 @@
             ],
           },
         ],
+        ['cb_service != "none"',
+          {
+            'dependencies' : [
+              '../command_buffer/command_buffer.gyp:command_buffer_client_test',
+              '../command_buffer/command_buffer.gyp:command_buffer_common_test',
+              '../command_buffer/command_buffer.gyp:command_buffer_service_test',
+            ],
+          },
+        ],
       ],
     },
   ],
-- 
cgit v1.1