Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / angle / tests / tests.gyp

diff --git a/src/third_party/angle/tests/tests.gyp b/src/third_party/angle/tests/tests.gyp
index 5985c34..73d94db 100644 (file)
--- a/src/third_party/angle/tests/tests.gyp
+++ b/src/third_party/angle/tests/tests.gyp
@@ -88,7 +88,6 @@
                 'preprocessor_tests/preprocessor_test_main.cpp',
             ],
         },
-
         {
             'target_name': 'compiler_tests',
             'type': 'executable',
@@ -112,33 +111,22 @@
             [
                 'compiler_tests/compiler_test_main.cpp',
             ],
-        },
-
-        {
-            'target_name': 'angle_implementation_unit_tests',
-            'type': 'executable',
-            'dependencies':
-            [
-                '../src/angle.gyp:libGLESv2_static',
-                'gtest',
-                'gmock',
-            ],
-            'include_dirs':
-            [
-                '../include',
-                '../src',
-                'third_party/googletest/include',
-                'third_party/googlemock/include',
-            ],
-            'includes':
-            [
-                '../build/common_defines.gypi',
-                'angle_implementation_unit_tests/angle_implementation_unit_tests.gypi',
-            ],
-            'sources':
-            [
-                'angle_implementation_unit_tests/angle_implementation_unit_tests_main.cpp',
-            ],
+            'msvs_settings':
+            {
+                'VCLinkerTool':
+                {
+                    'conditions':
+                    [
+                        ['angle_build_winrt==1',
+                        {
+                            'AdditionalDependencies':
+                            [
+                                'runtimeobject.lib',
+                            ],
+                        }],
+                    ],
+                },
+            },
         },
     ],
 
@@ -199,7 +187,6 @@
                     [
                         '../src/angle.gyp:libGLESv2',
                         '../src/angle.gyp:libEGL',
-                        'gtest',
                         '../util/util.gyp:angle_util',
                     ],
                     'include_dirs':
@@ -211,11 +198,66 @@
                     [
                         'perf_tests/BufferSubData.cpp',
                         'perf_tests/BufferSubData.h',
+                        'perf_tests/PointSprites.cpp',
+                        'perf_tests/PointSprites.h',
                         'perf_tests/SimpleBenchmark.cpp',
                         'perf_tests/SimpleBenchmark.h',
                         'perf_tests/SimpleBenchmarks.cpp',
                         'perf_tests/TexSubImage.cpp',
                         'perf_tests/TexSubImage.h',
+                        'perf_tests/third_party/perf/perf_test.cc',
+                        'perf_tests/third_party/perf/perf_test.h',
+                    ],
+                },
+
+                {
+                    'target_name': 'angle_implementation_unit_tests',
+                    'type': 'executable',
+                    'dependencies':
+                    [
+                        '../src/angle.gyp:libGLESv2_static',
+                        'gtest',
+                        'gmock',
+                    ],
+                    'include_dirs':
+                    [
+                        '../include',
+                        '../src',
+                        'third_party/googletest/include',
+                        'third_party/googlemock/include',
+                    ],
+                    'includes':
+                    [
+                        '../build/common_defines.gypi',
+                        'angle_implementation_unit_tests/angle_implementation_unit_tests.gypi',
+                    ],
+                    'sources':
+                    [
+                        'angle_implementation_unit_tests/angle_implementation_unit_tests_main.cpp',
+                    ],
+                    'conditions':
+                    [
+                        ['angle_build_winrt==1',
+                        {
+                            'sources':
+                            [
+                                'angle_implementation_unit_tests/CoreWindowNativeWindow_unittest.cpp',
+                            ],
+                            'defines':
+                            [
+                                'ANGLE_ENABLE_D3D11',
+                            ],
+                            'msvs_settings':
+                            {
+                                'VCLinkerTool':
+                                {
+                                    'AdditionalDependencies':
+                                    [
+                                        'runtimeobject.lib',
+                                    ],
+                                },
+                            },
+                        }],
                     ],
                 },
             ],