diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | remoting/BUILD.gn | 8 | ||||
| -rw-r--r-- | remoting/client/BUILD.gn | 2 | ||||
| -rw-r--r-- | remoting/host/BUILD.gn | 9 | ||||
| -rw-r--r-- | remoting/host/server_log_entry_host_unittest.cc | 6 | ||||
| -rw-r--r-- | remoting/host/setup/me2me_native_messaging_host_unittest.cc | 6 | ||||
| -rw-r--r-- | ui/resources/BUILD.gn | 8 |
7 files changed, 37 insertions, 6 deletions
@@ -756,7 +756,7 @@ if (is_linux) { "//net:net_unittests", # PASSES 2/25/2015 "//ppapi:ppapi_unittests", # PASSES 2/26/2015 "//printing:printing_unittests", # PASSES 2/25/2015 - "//remoting:remoting_unittests", # Some crashes. + "//remoting:remoting_unittests", # PASSES 4/17/2015 "//sandbox/linux:sandbox_linux_unittests", # PASSES 2/25/2015 "//skia:skia_unittests", # PASSES 2/25/2015 "//sql:sql_unittests", # PASSES 2/25/2015 @@ -769,7 +769,7 @@ if (is_linux) { "//ui/accessibility:accessibility_unittests", # PASSES 2/25/2015 "//ui/app_list:app_list_unittests", # PASSES 2/25/2015 "//ui/aura:aura_unittests", # PASSES 2/25/2015 - "//ui/base:ui_base_unittests", # TODO(GYP) ResourceBundleTest.* fails. + "//ui/base:ui_base_unittests", # PASSES 4/17/2015 "//ui/compositor:compositor_unittests", # PASSES 2/25/2015 "//ui/display:display_unittests", # PASSES 2/25/2015 "//ui/events:events_unittests", # PASSES 2/25/2015 diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index 36211d7..a72310a 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -96,8 +96,12 @@ if (!is_win && !is_mac) { "test/test_chromoting_client_unittest.cc", ] - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + configs += [ + ":version", + + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + "//build/config/compiler:no_size_t_to_int_warning", + ] deps = [ ":test_support", diff --git a/remoting/client/BUILD.gn b/remoting/client/BUILD.gn index ecbb86d..5bc14ec 100644 --- a/remoting/client/BUILD.gn +++ b/remoting/client/BUILD.gn @@ -33,6 +33,8 @@ source_set("unit_tests") { "server_log_entry_client_unittest.cc", ] + configs += [ "//remoting:version" ] + deps = [ ":client", "//remoting/proto", diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 5bbd40b..8e71b25 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -32,7 +32,10 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. libs = [] - configs += [ "//build/config/compiler:wexit_time_destructors" ] + configs += [ + "//build/config/compiler:wexit_time_destructors", + "//remoting:version", + ] defines = [ "WEBRTC_CHROMIUM_BUILD" ] @@ -170,6 +173,8 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. "fake_mouse_cursor_monitor.h", ] + configs += [ "//remoting:version" ] + deps = [ "//remoting/proto", "//testing/gtest", @@ -249,6 +254,8 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. sources -= [ "linux/x_server_clipboard_unittest.cc" ] } + configs += [ "//remoting:version" ] + deps = [ ":host", ":test_support", diff --git a/remoting/host/server_log_entry_host_unittest.cc b/remoting/host/server_log_entry_host_unittest.cc index be44621..d249c03 100644 --- a/remoting/host/server_log_entry_host_unittest.cc +++ b/remoting/host/server_log_entry_host_unittest.cc @@ -63,6 +63,12 @@ TEST(ServerLogEntryHostTest, AddHostFields) { #elif defined(OS_LINUX) key_value_pairs["os-name"] = "Linux"; #endif + + // The check below will compile but fail if VERSION isn't defined (STRINGIZE + // silently converts undefined values). + #ifndef VERSION + #error VERSION must be defined + #endif key_value_pairs["host-version"] = STRINGIZE(VERSION); ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << error; diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc index e48f3aa..c9a0ae0 100644 --- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc +++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc @@ -36,6 +36,12 @@ void VerifyHelloResponse(scoped_ptr<base::DictionaryValue> response) { EXPECT_TRUE(response->GetString("type", &value)); EXPECT_EQ("helloResponse", value); EXPECT_TRUE(response->GetString("version", &value)); + + // The check below will compile but fail if VERSION isn't defined (STRINGIZE + // silently converts undefined values). + #ifndef VERSION + #error VERSION must be defined + #endif EXPECT_EQ(STRINGIZE(VERSION), value); } diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn index 4487e03..538668c 100644 --- a/ui/resources/BUILD.gn +++ b/ui/resources/BUILD.gn @@ -72,7 +72,13 @@ if (is_ios || is_mac) { ] } } else { - group("ui_test_pak") { + copy("ui_test_pak") { + sources = [ + "$root_out_dir/ui_test.pak", + ] + outputs = [ + "$root_out_dir/ui/en-US.pak", + ] deps = [ ":repack_ui_test_pak", ] |