Remove definition and usage of macro GTEST_RELATIVE_PATH.
The macro GTEST_RELATIVE_PATH is obsolete and since it is always defined this CL just removes it. Bug: webrtc:9564 Change-Id: Ieafa5b77351c4df87864588ba6b3de8f60d54e89 Reviewed-on: https://webrtc-review.googlesource.com/92080 Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24226}
This commit is contained in:

committed by
Commit Bot

parent
c2342031f4
commit
8e5014a392
7
BUILD.gn
7
BUILD.gn
@ -104,12 +104,7 @@ config("common_inherited_config") {
|
|||||||
defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
|
defines += [ "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0" ]
|
||||||
}
|
}
|
||||||
if (build_with_chromium) {
|
if (build_with_chromium) {
|
||||||
defines += [
|
defines += [ "WEBRTC_CHROMIUM_BUILD" ]
|
||||||
# TODO(kjellander): Cleanup unused ones and move defines closer to
|
|
||||||
# the source when webrtc:4256 is completed.
|
|
||||||
"GTEST_RELATIVE_PATH",
|
|
||||||
"WEBRTC_CHROMIUM_BUILD",
|
|
||||||
]
|
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
# The overrides must be included first as that is the mechanism for
|
# The overrides must be included first as that is the mechanism for
|
||||||
# selecting the override headers in Chromium.
|
# selecting the override headers in Chromium.
|
||||||
|
@ -186,7 +186,6 @@ if (rtc_include_tests) {
|
|||||||
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
||||||
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
||||||
}
|
}
|
||||||
defines = [ "GTEST_RELATIVE_PATH" ]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -221,6 +220,5 @@ if (rtc_include_tests) {
|
|||||||
"../rtc_base:rtc_base_tests_utils",
|
"../rtc_base:rtc_base_tests_utils",
|
||||||
"//testing/gtest",
|
"//testing/gtest",
|
||||||
]
|
]
|
||||||
defines = [ "GTEST_RELATIVE_PATH" ]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -963,10 +963,6 @@ rtc_source_set("gtest_prod") {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
config("rtc_base_tests_utils_exported_config") {
|
|
||||||
defines = [ "GTEST_RELATIVE_PATH" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
rtc_source_set("rtc_base_tests_utils") {
|
rtc_source_set("rtc_base_tests_utils") {
|
||||||
testonly = true
|
testonly = true
|
||||||
sources = [
|
sources = [
|
||||||
@ -1010,7 +1006,6 @@ rtc_source_set("rtc_base_tests_utils") {
|
|||||||
"virtualsocketserver.cc",
|
"virtualsocketserver.cc",
|
||||||
"virtualsocketserver.h",
|
"virtualsocketserver.h",
|
||||||
]
|
]
|
||||||
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
|
|
||||||
deps = [
|
deps = [
|
||||||
":checks",
|
":checks",
|
||||||
":rtc_base",
|
":rtc_base",
|
||||||
@ -1060,7 +1055,6 @@ if (rtc_include_tests) {
|
|||||||
sources = [
|
sources = [
|
||||||
"unittest_main.cc",
|
"unittest_main.cc",
|
||||||
]
|
]
|
||||||
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
|
|
||||||
deps = [
|
deps = [
|
||||||
":rtc_base",
|
":rtc_base",
|
||||||
":rtc_base_approved",
|
":rtc_base_approved",
|
||||||
|
@ -14,11 +14,7 @@
|
|||||||
#include "rtc_base/fakeclock.h"
|
#include "rtc_base/fakeclock.h"
|
||||||
#include "rtc_base/logging.h"
|
#include "rtc_base/logging.h"
|
||||||
#include "rtc_base/thread.h"
|
#include "rtc_base/thread.h"
|
||||||
#if defined(GTEST_RELATIVE_PATH)
|
|
||||||
#include "test/gtest.h"
|
#include "test/gtest.h"
|
||||||
#else
|
|
||||||
#include "testing/base/public/gunit.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Wait until "ex" is true, or "timeout" expires.
|
// Wait until "ex" is true, or "timeout" expires.
|
||||||
#define WAIT(ex, timeout) \
|
#define WAIT(ex, timeout) \
|
||||||
|
@ -15,10 +15,8 @@
|
|||||||
// Android doesn't use gtest at all, so anything that relies on gtest should
|
// Android doesn't use gtest at all, so anything that relies on gtest should
|
||||||
// check this define first.
|
// check this define first.
|
||||||
#define NO_GTEST
|
#define NO_GTEST
|
||||||
#elif defined(GTEST_RELATIVE_PATH)
|
|
||||||
#include "gtest/gtest_prod.h"
|
|
||||||
#else
|
#else
|
||||||
#include "testing/base/gunit_prod.h"
|
#include "gtest/gtest_prod.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // RTC_BASE_GUNIT_PROD_H_
|
#endif // RTC_BASE_GUNIT_PROD_H_
|
||||||
|
@ -90,10 +90,7 @@ if (rtc_enable_protobuf) {
|
|||||||
deps += [ ":network_tester_unittests_bundle_data" ]
|
deps += [ ":network_tester_unittests_bundle_data" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
defines = [
|
defines = [ "WEBRTC_NETWORK_TESTER_TEST_ENABLED" ]
|
||||||
"GTEST_RELATIVE_PATH",
|
|
||||||
"WEBRTC_NETWORK_TESTER_TEST_ENABLED",
|
|
||||||
]
|
|
||||||
|
|
||||||
data = network_tester_unittests_resources
|
data = network_tester_unittests_resources
|
||||||
|
|
||||||
|
@ -890,7 +890,6 @@ if (is_ios || is_mac) {
|
|||||||
# https://developer.apple.com/library/mac/qa/qa1490/_index.html
|
# https://developer.apple.com/library/mac/qa/qa1490/_index.html
|
||||||
ldflags = [ "-ObjC" ]
|
ldflags = [ "-ObjC" ]
|
||||||
|
|
||||||
defines = [ "GTEST_RELATIVE_PATH" ]
|
|
||||||
deps = [
|
deps = [
|
||||||
":common_objc",
|
":common_objc",
|
||||||
":mediaconstraints_objc",
|
":mediaconstraints_objc",
|
||||||
|
Reference in New Issue
Block a user