diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2016-01-22 20:16:21 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2016-01-25 18:59:29 +0000 |
| commit | e03c0946c88601203e97b2da3de2d8b478f43c34 (patch) | |
| tree | 9c9cbb7be108ffc51ffab0176c6e2712443f6288 /third_party | |
| parent | 0dbbf605efb8f72b3c2c15c14e613323fc2ac0a2 (diff) | |
| download | libweave-e03c0946c88601203e97b2da3de2d8b478f43c34.tar.gz | |
Include of gtest_prod.h only building unittests
Change-Id: I605ba14fa7e205158aef671c98938b911362b5b6
Reviewed-on: https://weave-review.googlesource.com/2329
Reviewed-by: Jacob Marble <jacobmarble@google.com>
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/chromium/base/gtest_prod_util.h | 8 | ||||
| -rw-r--r-- | third_party/third_party.mk | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/third_party/chromium/base/gtest_prod_util.h b/third_party/chromium/base/gtest_prod_util.h index b90cd4e..b3db728 100644 --- a/third_party/chromium/base/gtest_prod_util.h +++ b/third_party/chromium/base/gtest_prod_util.h @@ -5,6 +5,8 @@ #ifndef BASE_GTEST_PROD_UTIL_H_ #define BASE_GTEST_PROD_UTIL_H_ +#if defined(HAS_GTEST) + #include <gtest/gtest_prod.h> // This is a wrapper for gtest's FRIEND_TEST macro that friends @@ -63,4 +65,10 @@ class test_case_name##_##DISABLED_##test_name##_Test; \ class test_case_name##_##FLAKY_##test_name##_Test +#else // defined(HAS_GTEST) + +#define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) + +#endif // defined(HAS_GTEST) + #endif // BASE_GTEST_PROD_UTIL_H_ diff --git a/third_party/third_party.mk b/third_party/third_party.mk index c3e1cf0..f092e89 100644 --- a/third_party/third_party.mk +++ b/third_party/third_party.mk @@ -7,7 +7,7 @@ third_party_chromium_base_obj_files := $(THIRD_PARTY_CHROMIUM_BASE_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) -$(third_party_chromium_base_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/include/gtest/gtest.h +$(third_party_chromium_base_obj_files) : out/$(BUILD_MODE)/%.o : %.cc mkdir -p $(dir $@) $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< @@ -15,11 +15,11 @@ third_party_chromium_base_unittest_obj_files := $(THIRD_PARTY_CHROMIUM_BASE_UNIT $(third_party_chromium_base_unittest_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/include/gtest/gtest.h mkdir -p $(dir $@) - $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< + $(CXX) $(DEFS_TEST) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< third_party_chromium_crypto_obj_files := $(THIRD_PARTY_CHROMIUM_CRYPTO_SRC_FILES:%.cc=out/$(BUILD_MODE)/%.o) -$(third_party_chromium_crypto_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/include/gtest/gtest.h +$(third_party_chromium_crypto_obj_files) : out/$(BUILD_MODE)/%.o : %.cc mkdir -p $(dir $@) $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< @@ -27,7 +27,7 @@ third_party_chromium_crypto_unittest_obj_files := $(THIRD_PARTY_CHROMIUM_CRYPTO_ $(third_party_chromium_crypto_unittest_obj_files) : out/$(BUILD_MODE)/%.o : %.cc third_party/include/gtest/gtest.h mkdir -p $(dir $@) - $(CXX) $(DEFS_$(BUILD_MODE)) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< + $(CXX) $(DEFS_TEST) $(INCLUDES) $(CFLAGS) $(CFLAGS_$(BUILD_MODE)) $(CFLAGS_CC) -c -o $@ $< ### # third_party/modp_b64/ |