diff options
| author | Mirko Bonadei <mbonadei@webrtc.org> | 2018-08-02 13:36:10 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-08-08 11:00:11 +0000 |
| commit | 8e5014a3925eb070aca00fcff0aa9c36fd30fb3b (patch) | |
| tree | b24d6917ffa39af746d4fd57012287363f564430 /rtc_base | |
| parent | c2342031f4d9c4f55b666115ad2430aec921df9c (diff) | |
| download | webrtc-8e5014a3925eb070aca00fcff0aa9c36fd30fb3b.tar.gz | |
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}
Diffstat (limited to 'rtc_base')
| -rw-r--r-- | rtc_base/BUILD.gn | 6 | ||||
| -rw-r--r-- | rtc_base/gunit.h | 4 | ||||
| -rw-r--r-- | rtc_base/gunit_prod.h | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 2987420343..fb6f103203 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -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") { testonly = true sources = [ @@ -1010,7 +1006,6 @@ rtc_source_set("rtc_base_tests_utils") { "virtualsocketserver.cc", "virtualsocketserver.h", ] - public_configs = [ ":rtc_base_tests_utils_exported_config" ] deps = [ ":checks", ":rtc_base", @@ -1060,7 +1055,6 @@ if (rtc_include_tests) { sources = [ "unittest_main.cc", ] - public_configs = [ ":rtc_base_tests_utils_exported_config" ] deps = [ ":rtc_base", ":rtc_base_approved", diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h index 145b4666d0..910fbf39ba 100644 --- a/rtc_base/gunit.h +++ b/rtc_base/gunit.h @@ -14,11 +14,7 @@ #include "rtc_base/fakeclock.h" #include "rtc_base/logging.h" #include "rtc_base/thread.h" -#if defined(GTEST_RELATIVE_PATH) #include "test/gtest.h" -#else -#include "testing/base/public/gunit.h" -#endif // Wait until "ex" is true, or "timeout" expires. #define WAIT(ex, timeout) \ diff --git a/rtc_base/gunit_prod.h b/rtc_base/gunit_prod.h index bf4f9a184c..dae2084d15 100644 --- a/rtc_base/gunit_prod.h +++ b/rtc_base/gunit_prod.h @@ -15,10 +15,8 @@ // Android doesn't use gtest at all, so anything that relies on gtest should // check this define first. #define NO_GTEST -#elif defined(GTEST_RELATIVE_PATH) -#include "gtest/gtest_prod.h" #else -#include "testing/base/gunit_prod.h" +#include "gtest/gtest_prod.h" #endif #endif // RTC_BASE_GUNIT_PROD_H_ |