From 30eb751d1a778b73e20c238ec2f54b7293eb1b6f Mon Sep 17 00:00:00 2001
From: "gspencer@google.com"
 <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 1 Jul 2009 22:30:03 +0000
Subject: 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
---
 o3d/statsreport/statsreport.gyp | 53 ++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

(limited to 'o3d/statsreport/statsreport.gyp')

diff --git a/o3d/statsreport/statsreport.gyp b/o3d/statsreport/statsreport.gyp
index 2b045d6..99b97e6 100644
--- a/o3d/statsreport/statsreport.gyp
+++ b/o3d/statsreport/statsreport.gyp
@@ -84,33 +84,38 @@
           },
           {
             'target_name': 'o3dStatsReportTest',
-            'type': 'static_library',
-            'sources': [
-              'aggregator-win32_unittest.cc',
-              'aggregator-win32_unittest.h',
-              'aggregator_unittest.cc',
-              'aggregator_unittest.h',
-              'common/highres_timer_unittest.cc',
-              'formatter_unittest.cc',
-              'metrics_unittest.cc',
-              'persistent_iterator-win32_unittest.cc',
+            'type': 'none',
+            'dependencies': [
+              'o3dStatsReport',
             ],
-            'conditions': [
-              ['OS != "win"',
-                {
-                  'sources/': [
-                    ['exclude', '(-win32)_unittest\.(cc|h)$'],
-                  ],
-                },
+            'direct_dependent_settings': {
+              'sources': [
+                'aggregator-win32_unittest.cc',
+                'aggregator-win32_unittest.h',
+                'aggregator_unittest.cc',
+                'aggregator_unittest.h',
+                'common/highres_timer_unittest.cc',
+                'formatter_unittest.cc',
+                'metrics_unittest.cc',
+                'persistent_iterator-win32_unittest.cc',
               ],
-              ['OS != "mac"',
-                {
-                  'sources/': [
-                    ['exclude', '(-mac)_unittest\.(cc|mm|h)$'],
-                  ],
-                },
+              'conditions': [
+                ['OS != "win"',
+                  {
+                    'sources/': [
+                      ['exclude', '(-win32)_unittest\.(cc|h)$'],
+                    ],
+                  },
+                ],
+                ['OS != "mac"',
+                  {
+                    'sources/': [
+                      ['exclude', '(-mac)_unittest\.(cc|mm|h)$'],
+                    ],
+                  },
+                ],
               ],
-            ],
+            },
           },
         ],
       },
-- 
cgit v1.1