summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-03-04 09:24:45 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-04 17:25:38 +0000
commit31f4de692fea12661a046a0fc8d091ff6f04654d (patch)
treef5f607b3fda304a32c36bc1999fcefee8bf423df /ppapi
parent568f43629db2ee7c2121adf576c21e06554d5c2e (diff)
downloadchromium_src-31f4de692fea12661a046a0fc8d091ff6f04654d.zip
chromium_src-31f4de692fea12661a046a0fc8d091ff6f04654d.tar.gz
chromium_src-31f4de692fea12661a046a0fc8d091ff6f04654d.tar.bz2
Add remoting and PPAPI tests to GN build
Reland of https://codereview.chromium.org/961323004 TBR=dpranke Review URL: https://codereview.chromium.org/969173002 Cr-Commit-Position: refs/heads/master@{#319080}
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/BUILD.gn76
-rw-r--r--ppapi/ppapi_host.gypi2
-rw-r--r--ppapi/ppapi_tests.gypi4
3 files changed, 80 insertions, 2 deletions
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index 3c302ab..9bc9e88 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -27,6 +27,8 @@ copy("copy_test_files2") {
}
import("//ppapi/ppapi_sources.gni")
+import("//testing/test.gni")
+
shared_library("ppapi_tests") {
sources = ppapi_sources.test_common_source_files +
ppapi_sources.test_trusted_source_files
@@ -41,4 +43,76 @@ shared_library("ppapi_tests") {
":copy_test_files2",
]
}
-# TODO(GYP) other targets from ppapi_tests.gyp
+
+test("ppapi_unittests") {
+ sources = [
+ "host/resource_message_filter_unittest.cc",
+ "proxy/device_enumeration_resource_helper_unittest.cc",
+ "proxy/file_chooser_resource_unittest.cc",
+ "proxy/file_system_resource_unittest.cc",
+ "proxy/flash_resource_unittest.cc",
+ "proxy/interface_list_unittest.cc",
+ "proxy/mock_resource.cc",
+ "proxy/mock_resource.h",
+ "proxy/nacl_message_scanner_unittest.cc",
+ "proxy/pdf_resource_unittest.cc",
+ "proxy/plugin_dispatcher_unittest.cc",
+ "proxy/plugin_resource_tracker_unittest.cc",
+ "proxy/plugin_var_tracker_unittest.cc",
+ "proxy/ppb_var_unittest.cc",
+ "proxy/ppp_instance_private_proxy_unittest.cc",
+ "proxy/ppp_instance_proxy_unittest.cc",
+ "proxy/ppp_messaging_proxy_unittest.cc",
+ "proxy/printing_resource_unittest.cc",
+ "proxy/raw_var_data_unittest.cc",
+ "proxy/serialized_var_unittest.cc",
+ "proxy/talk_resource_unittest.cc",
+ "proxy/video_decoder_resource_unittest.cc",
+ "proxy/video_encoder_resource_unittest.cc",
+ "proxy/websocket_resource_unittest.cc",
+ "shared_impl/media_stream_audio_track_shared_unittest.cc",
+ "shared_impl/media_stream_buffer_manager_unittest.cc",
+ "shared_impl/media_stream_video_track_shared_unittest.cc",
+ "shared_impl/proxy_lock_unittest.cc",
+ "shared_impl/resource_tracker_unittest.cc",
+ "shared_impl/thread_aware_callback_unittest.cc",
+ "shared_impl/time_conversion_unittest.cc",
+ "shared_impl/tracked_callback_unittest.cc",
+ "shared_impl/var_tracker_unittest.cc",
+ ]
+
+ deps = [
+ "//base/allocator",
+ "//base/test:run_all_unittests",
+ "//base/test:test_support",
+ "//gpu/ipc",
+ "//ipc",
+ "//ipc:test_support",
+ "//media:shared_memory_support",
+ "//ppapi/host",
+ "//ppapi/proxy",
+ "//ppapi/proxy:test_support",
+ "//ppapi/shared_impl",
+ "//ppapi/shared_impl:test_support",
+ "//testing/gmock",
+ "//testing/gtest",
+ "//ui/surface",
+ ]
+}
+
+test("ppapi_perftests") {
+ sources = [
+ "proxy/ppapi_perftests.cc",
+ "proxy/ppp_messaging_proxy_perftest.cc",
+ ]
+
+ deps = [
+ "//base/allocator",
+ "//base/test:test_support",
+ "//ppapi/proxy",
+ "//ppapi/proxy:test_support",
+ "//ppapi/shared_impl",
+ "//ppapi/shared_impl:test_support",
+ "//testing/gtest",
+ ]
+}
diff --git a/ppapi/ppapi_host.gypi b/ppapi/ppapi_host.gypi
index eea53b4..3113ddf 100644
--- a/ppapi/ppapi_host.gypi
+++ b/ppapi/ppapi_host.gypi
@@ -5,7 +5,7 @@
{
'targets': [
{
- # GN version: //ppapi:ppapi_host
+ # GN version: //ppapi/host
'target_name': 'ppapi_host',
'type': '<(component)',
'dependencies': [
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index 3267e0b..0002843 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -5,6 +5,7 @@
{
'targets': [
{
+ # GN version: //ppapi:ppapi_tests
'target_name': 'ppapi_tests',
'type': 'loadable_module',
'include_dirs': [
@@ -106,6 +107,7 @@
},
{
+ # GN version: //ppapi:ppapi_perftests
'target_name': 'ppapi_perftests',
'type': 'executable',
'variables': {
@@ -132,6 +134,7 @@
],
},
{
+ # GN version: //ppapi:ppapi_unittests
'target_name': 'ppapi_unittests',
'type': 'executable',
'variables': {
@@ -153,6 +156,7 @@
'../ui/surface/surface.gyp:surface',
],
'sources': [
+ # Note: sources list duplicated in GN build.
'host/resource_message_filter_unittest.cc',
'proxy/device_enumeration_resource_helper_unittest.cc',
'proxy/file_chooser_resource_unittest.cc',