Make perftests compile on Linux

BUG=angleproject:892 Change-Id: I3fe43c7a84d1eb2b875309495fe27a0bfd6c3e82 Reviewed-on: https://chromium-review.googlesource.com/272552Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

Make perftests compile on Linux
1b21fd39 · Corentin Wallez · 08971bff · 1b21fd39 · 1b21fd39
Commit 1b21fd39 authored May 20, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 40 additions and 30 deletions

angle_perftests.gypi src/tests/angle_perftests.gypi +30 -10

tests.gyp src/tests/tests.gyp +10 -20

No files found.
--- a/src/tests/angle_perftests.gypi
+++ b/src/tests/angle_perftests.gypi
@@ -11,6 +11,25 @@
 # target containing a gtest harness in a main.cpp.

 {
+    'variables':
+    {
+        'angle_perf_tests_sources':
+        [
+            'perf_tests/ANGLEPerfTest.cpp',
+            'perf_tests/ANGLEPerfTest.h',
+            'perf_tests/BufferSubData.cpp',
+            'perf_tests/DrawCallPerf.cpp',
+            'perf_tests/IndexConversionPerf.cpp',
+            'perf_tests/PointSprites.cpp',
+            'perf_tests/TexSubImage.cpp',
+            'perf_tests/third_party/perf/perf_test.cc',
+            'perf_tests/third_party/perf/perf_test.h',
+        ],
+        'angle_perf_tests_win_sources':
+        [
+            'perf_tests/IndexDataManagerTest.cpp',
+        ]
+    },
    'dependencies':
    [
        '<(angle_path)/src/angle.gyp:angle_common',
@@ -26,15 +45,16 @@
    ],
    'sources':
    [
-        'perf_tests/ANGLEPerfTest.cpp',
-        'perf_tests/ANGLEPerfTest.h',
-        'perf_tests/BufferSubData.cpp',
-        'perf_tests/DrawCallPerf.cpp',
-        'perf_tests/IndexConversionPerf.cpp',
-        'perf_tests/IndexDataManagerTest.cpp',
-        'perf_tests/PointSprites.cpp',
-        'perf_tests/TexSubImage.cpp',
-        'perf_tests/third_party/perf/perf_test.cc',
-        'perf_tests/third_party/perf/perf_test.h',
+        '<@(angle_perf_tests_sources)',
    ],
+    'conditions':
+    [
+        ['OS=="win"',
+        {
+            'sources':
+            [
+                '<@(angle_perf_tests_win_sources)',
+            ],
+        }],
+    ]
 }
--- a/src/tests/tests.gyp
+++ b/src/tests/tests.gyp
@@ -196,29 +196,19 @@
                        'angle_end2end_tests_main.cpp',
                    ],
                },
-            ],
-            'conditions':
-            [
-                ['OS=="win"',
                {
-                    'targets':
+                    'target_name': 'angle_perftests',
+                    'type': 'executable',
+                    'includes':
                    [
-
-                        {
-                            'target_name': 'angle_perftests',
-                            'type': 'executable',
-                            'includes':
-                            [
-                                '../../build/common_defines.gypi',
-                                'angle_perftests.gypi',
-                            ],
-                            'sources':
-                            [
-                                'angle_perftests_main.cpp',
-                            ],
-                        },
+                        '../../build/common_defines.gypi',
+                        'angle_perftests.gypi',
                    ],
-                }],
+                    'sources':
+                    [
+                        'angle_perftests_main.cpp',
+                    ],
+                },
            ],
        }],
        ['OS=="win"',