Adding in most of the unit tests. This adds 406 of our unit tests

into the gyp build.  21 of them fail, but that is only because they don't
have test input yet -- I haven't added the build code that copies
the test inputs into the build dir yet.
Review URL: http://codereview.chromium.org/147129

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

2 files changed, 64 insertions, 59 deletions

diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index 1f27990..949b9f5 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -35,6 +35,7 @@
         '../../<(pngdir)/libpng.gyp:libpng',
         '../../<(zlibdir)/zlib.gyp:zlib',
         '../../skia/skia.gyp:skia',
+        '../build/nacl.gyp:build_nacl',
       ],
       'sources': [
         'cross/bitmap.cc',
@@ -268,63 +269,6 @@
       ],
     },
     {
-      'target_name': 'o3dCoreTest',
-      'type': 'static_library',
-      'dependencies': [
-      ],
-      'sources': [
-        'cross/bitmap_test.cc',
-        'cross/bounding_box_test.cc',
-        'cross/buffer_test.cc',
-        'cross/class_manager_test.cc',
-        'cross/client_test.cc',
-        'cross/counter_test.cc',
-        'cross/curve_test.cc',
-        'cross/draw_element_test.cc',
-        'cross/draw_list_test.cc',
-        'cross/draw_pass_test.cc',
-        'cross/effect_test.cc',
-        'cross/element_test.cc',
-        'cross/features_test.cc',
-        'cross/field_test.cc',
-        'cross/float_n_test.cc',
-        'cross/function_test.cc',
-        'cross/material_test.cc',
-        'cross/math_utilities_test.cc',
-        'cross/matrix4_axis_rotation_test.cc',
-        'cross/matrix4_composition_test.cc',
-        'cross/matrix4_scale_test.cc',
-        'cross/matrix4_translation_test.cc',
-# TODO(gspencer): fix this test so it can be re-enabled.
-#       'cross/message_queue_test.cc',
-        'cross/object_base_test.cc',
-        'cross/pack_test.cc',
-        'cross/param_array_test.cc',
-        'cross/param_object_test.cc',
-        'cross/param_operation_test.cc',
-        'cross/param_test.cc',
-        'cross/performance_timer_test.cc',
-        'cross/primitive_test.cc',
-        'cross/ray_intersection_info_test.cc',
-        'cross/render_node_test.cc',
-        'cross/renderer_test.cc',
-        'cross/service_locator_test.cc',
-        'cross/shape_test.cc',
-        'cross/skin_test.cc',
-        'cross/smart_ptr_test.cc',
-        'cross/state_set_test.cc',
-        'cross/state_test.cc',
-        'cross/stream_bank_test.cc',
-        'cross/stream_test.cc',
-        'cross/transform_test.cc',
-        'cross/tree_traversal_test.cc',
-        'cross/vector_map_test.cc',
-        'cross/vertex_source_test.cc',
-        'cross/visitor_base_test.cc',
-        'cross/weak_ptr_test.cc',
-      ],
-    },
-    {
       'target_name': 'o3dCorePlatform',
       'type': 'static_library',
       'dependencies': [
@@ -395,5 +339,66 @@
         ],
       ],
     },
+    {
+      'target_name': 'o3dCoreTest',
+      'type': 'none',
+      'dependencies': [
+        'o3dCore',
+        'o3dCorePlatform',
+      ],
+      'direct_dependent_settings': {
+        'sources': [
+          'cross/bitmap_test.cc',
+          'cross/bounding_box_test.cc',
+          'cross/buffer_test.cc',
+          'cross/class_manager_test.cc',
+          'cross/client_test.cc',
+          'cross/counter_test.cc',
+          'cross/curve_test.cc',
+          'cross/draw_element_test.cc',
+          'cross/draw_list_test.cc',
+          'cross/draw_pass_test.cc',
+          'cross/effect_test.cc',
+          'cross/element_test.cc',
+          'cross/features_test.cc',
+          'cross/field_test.cc',
+          'cross/float_n_test.cc',
+          'cross/function_test.cc',
+          'cross/material_test.cc',
+          'cross/math_utilities_test.cc',
+          'cross/matrix4_axis_rotation_test.cc',
+          'cross/matrix4_composition_test.cc',
+          'cross/matrix4_scale_test.cc',
+          'cross/matrix4_translation_test.cc',
+  # TODO(gspencer): fix this test so it can be re-enabled.
+  #       'cross/message_queue_test.cc',
+          'cross/object_base_test.cc',
+          'cross/pack_test.cc',
+          'cross/param_array_test.cc',
+          'cross/param_object_test.cc',
+          'cross/param_operation_test.cc',
+          'cross/param_test.cc',
+          'cross/performance_timer_test.cc',
+          'cross/primitive_test.cc',
+          'cross/ray_intersection_info_test.cc',
+          'cross/render_node_test.cc',
+          'cross/renderer_test.cc',
+          'cross/service_locator_test.cc',
+          'cross/shape_test.cc',
+          'cross/skin_test.cc',
+          'cross/smart_ptr_test.cc',
+          'cross/state_set_test.cc',
+          'cross/state_test.cc',
+          'cross/stream_bank_test.cc',
+          'cross/stream_test.cc',
+          'cross/transform_test.cc',
+          'cross/tree_traversal_test.cc',
+          'cross/vector_map_test.cc',
+          'cross/vertex_source_test.cc',
+          'cross/visitor_base_test.cc',
+          'cross/weak_ptr_test.cc',
+        ],
+      },
+    },
   ],
 }
diff --git a/o3d/core/win/d3d9/effect_d3d9.cc b/o3d/core/win/d3d9/effect_d3d9.cc
index 2bac2d9..830f5a4 100644
--- a/o3d/core/win/d3d9/effect_d3d9.cc
+++ b/o3d/core/win/d3d9/effect_d3d9.cc
@@ -254,7 +254,7 @@ class EffectParamSamplerArrayHandlerD3D9 : public EffectParamHandlerD3D9 {
             << "number of params in ParamArray does not match number of params "
             << "needed by shader array";
       } else {
-        for (int i = 0; i < size; ++i) {
+        for (unsigned i = 0; i < size; ++i) {
           SamplerUnitIndexArray& index_array = sampler_unit_index_arrays_[i];
           Param* untyped_element = param->GetUntypedParam(i);
           // TODO(gman): Make this check happen when building the param cache.
@@ -297,7 +297,7 @@ class EffectParamSamplerArrayHandlerD3D9 : public EffectParamHandlerD3D9 {
     if (param) {
       unsigned size = param->size();
       if (size == sampler_unit_index_arrays_.size()) {
-        for (int i = 0; i < size; ++i) {
+        for (unsigned i = 0; i < size; ++i) {
           SamplerUnitIndexArray& index_array = sampler_unit_index_arrays_[i];
           Param* untyped_element = param->GetUntypedParam(i);
           // TODO(gman): Make this check happen when building the param cache.