Skip to content

A
angle
Commit 7bff24c1 by Kenneth Russell
Options

Rename and slightly reorganize test targets.

Use "angle_" prefix for all targets to disambiguate them from any potential Chromium-side targets. Combine compiler and preprocessor tests into angle_compiler_tests. (Chromium's "angle_unittests" target contains both.) Deleted preprocessor_test_main.cpp. BUG=angleproject:833 Change-Id: I7acc5a76f49c15d0064c16d2ace256f9cc86e9e8 Reviewed-on: https://chromium-review.googlesource.com/231185Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Tested-by: 's avatarKenneth Russell <kbr@chromium.org>
parent 1edac3b1
Showing with 17 additions and 51 deletions
tests/preprocessor_tests/preprocessor_test_main.cpp deleted 100644 → 0
//
// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#include "gmock/gmock.h"
#include "gtest/gtest.h"
int main(int argc, char** argv)
{
testing::InitGoogleMock(&argc, argv);
int rt = RUN_ALL_TESTS();
return rt;
}
tests/tests.gyp
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
}, },
}, },
{ {
'target_name': 'test_support', 'target_name': 'angle_test_support',
'type': 'none', 'type': 'none',
'conditions': 'conditions':
[ [
...@@ -104,44 +104,25 @@ ...@@ -104,44 +104,25 @@
], ],
}, },
{ {
'target_name': 'preprocessor_tests', 'target_name': 'angle_compiler_tests',
'type': 'executable', 'type': 'executable',
'dependencies': 'dependencies':
[ [
'../src/angle.gyp:preprocessor', '../src/angle.gyp:preprocessor',
'test_support',
],
'include_dirs':
[
'../src/compiler/preprocessor',
],
'includes':
[
'../build/common_defines.gypi',
'preprocessor_tests/preprocessor_tests.gypi',
],
'sources':
[
'preprocessor_tests/preprocessor_test_main.cpp',
],
},
{
'target_name': 'compiler_tests',
'type': 'executable',
'dependencies':
[
'../src/angle.gyp:translator_static', '../src/angle.gyp:translator_static',
'test_support', 'angle_test_support',
], ],
'include_dirs': 'include_dirs':
[ [
'../include', '../include',
'../src', '../src',
'../src/compiler/preprocessor',
], ],
'includes': 'includes':
[ [
'../build/common_defines.gypi', '../build/common_defines.gypi',
'compiler_tests/compiler_tests.gypi', 'compiler_tests/compiler_tests.gypi',
'preprocessor_tests/preprocessor_tests.gypi',
], ],
'sources': 'sources':
[ [
...@@ -173,7 +154,7 @@ ...@@ -173,7 +154,7 @@
'targets': 'targets':
[ [
{ {
'target_name': 'angle_tests', 'target_name': 'angle_end2end_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'dependencies': 'dependencies':
...@@ -181,7 +162,7 @@ ...@@ -181,7 +162,7 @@
'../src/angle.gyp:libGLESv2', '../src/angle.gyp:libGLESv2',
'../src/angle.gyp:libEGL', '../src/angle.gyp:libEGL',
'../util/util.gyp:angle_util', '../util/util.gyp:angle_util',
'test_support', 'angle_test_support',
], ],
'include_dirs': 'include_dirs':
[ [
...@@ -194,12 +175,12 @@ ...@@ -194,12 +175,12 @@
], ],
}, },
{ {
'target_name': 'standalone_tests', 'target_name': 'angle_standalone_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'dependencies': 'dependencies':
[ [
'test_support', 'angle_test_support',
], ],
'include_dirs': 'include_dirs':
[ [
...@@ -220,7 +201,7 @@ ...@@ -220,7 +201,7 @@
'../src/angle.gyp:libGLESv2', '../src/angle.gyp:libGLESv2',
'../src/angle.gyp:libEGL', '../src/angle.gyp:libEGL',
'../util/util.gyp:angle_util', '../util/util.gyp:angle_util',
'test_support', 'angle_test_support',
], ],
'include_dirs': 'include_dirs':
[ [
...@@ -248,7 +229,7 @@ ...@@ -248,7 +229,7 @@
'dependencies': 'dependencies':
[ [
'../src/angle.gyp:libGLESv2_static', '../src/angle.gyp:libGLESv2_static',
'test_support', 'angle_test_support',
], ],
'include_dirs': 'include_dirs':
[ [
...@@ -304,7 +285,7 @@ ...@@ -304,7 +285,7 @@
'targets': 'targets':
[ [
{ {
'target_name': 'gles2_conformance_tests', 'target_name': 'angle_gles2_conformance_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'dependencies': 'dependencies':
...@@ -313,7 +294,7 @@ ...@@ -313,7 +294,7 @@
'../src/angle.gyp:libEGL', '../src/angle.gyp:libEGL',
'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es_cts_test_data', 'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es_cts_test_data',
'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es2_cts', 'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es2_cts',
'test_support', 'angle_test_support',
], ],
'variables': 'variables':
{ {
...@@ -361,7 +342,7 @@ ...@@ -361,7 +342,7 @@
], ],
}, },
{ {
'target_name': 'gles3_conformance_tests', 'target_name': 'angle_gles3_conformance_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'dependencies': 'dependencies':
...@@ -370,7 +351,7 @@ ...@@ -370,7 +351,7 @@
'../src/angle.gyp:libEGL', '../src/angle.gyp:libEGL',
'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es_cts_test_data', 'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es_cts_test_data',
'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es3_cts', 'third_party/gles_conformance_tests/conform/GTF_ES/glsl/GTF/es_cts.gyp:es3_cts',
'test_support', 'angle_test_support',
], ],
'variables': 'variables':
{ {
...@@ -432,7 +413,7 @@ ...@@ -432,7 +413,7 @@
'targets': 'targets':
[ [
{ {
'target_name': 'deqp_tests', 'target_name': 'angle_deqp_tests',
'type': 'executable', 'type': 'executable',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'dependencies': 'dependencies':
...@@ -441,7 +422,7 @@ ...@@ -441,7 +422,7 @@
'../src/angle.gyp:libEGL', '../src/angle.gyp:libEGL',
'third_party/deqp/src/deqp/modules/gles3/gles3.gyp:deqp-gles3', 'third_party/deqp/src/deqp/modules/gles3/gles3.gyp:deqp-gles3',
'third_party/deqp/src/deqp/framework/platform/platform.gyp:tcutil-platform', 'third_party/deqp/src/deqp/framework/platform/platform.gyp:tcutil-platform',
'test_support', 'angle_test_support',
], ],
'include_dirs': 'include_dirs':
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment