Use GTEST_LANG_CXX11 in V8
For GYP build, V8 configures gtest and gmock in its //testing, and OTOH for GN build, it imports BUILD.gn from chromium and uses other configurations from its own. However, a recent chromium change on the BUILD.gn requires //testing update too. That prevents //build roll of V8. BUG=chromium:630299 Review-Url: https://codereview.chromium.org/2179743002 Cr-Commit-Position: refs/heads/master@{#38021}
This commit is contained in:
parent
88a795d1c8
commit
497e10bf65
@ -31,16 +31,19 @@
|
||||
'gmock/src/gmock-spec-builders.cc',
|
||||
'gmock/src/gmock.cc',
|
||||
'gmock-support.h', # gMock helpers
|
||||
'gmock_custom/gmock/internal/custom/gmock-port.h',
|
||||
],
|
||||
'sources!': [
|
||||
'gmock/src/gmock-all.cc', # Not needed by our build.
|
||||
],
|
||||
'include_dirs': [
|
||||
'gmock_custom',
|
||||
'gmock',
|
||||
'gmock/include',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'all_dependent_settings': {
|
||||
'include_dirs': [
|
||||
'gmock_custom',
|
||||
'gmock/include', # So that gmock headers can find themselves.
|
||||
],
|
||||
},
|
||||
|
29
testing/gmock_custom/gmock/internal/custom/gmock-port.h
Normal file
29
testing/gmock_custom/gmock/internal/custom/gmock-port.h
Normal file
@ -0,0 +1,29 @@
|
||||
// Copyright 2016 the V8 project authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
// Copied from http://crrev.com/6ad76b419eacefc4/testing/gmock_custom/gmock/internal/custom/gmock-port.h
|
||||
|
||||
#ifndef TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
|
||||
#define TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
|
||||
|
||||
#include <type_traits>
|
||||
|
||||
namespace std {
|
||||
|
||||
// Provide alternative implementation of std::is_default_constructible for
|
||||
// old, pre-4.7 of libstdc++, where is_default_constructible is missing.
|
||||
// <20120322 below implies pre-4.7.0. In addition we blacklist several version
|
||||
// that released after 4.7.0 from pre-4.7.0 branch. 20120702 implies 4.5.4, and
|
||||
// 20121127 implies 4.6.4.
|
||||
#if defined(__GLIBCXX__) && \
|
||||
(__GLIBCXX__ < 20120322 || \
|
||||
__GLIBCXX__ == 20120702 || \
|
||||
__GLIBCXX__ == 20121127)
|
||||
template <typename T>
|
||||
using is_default_constructible = std::is_constructible<T>;
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
#endif // TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
|
@ -53,33 +53,15 @@
|
||||
# In order to allow regex matches in gtest to be shared between Windows
|
||||
# and other systems, we tell gtest to always use it's internal engine.
|
||||
'GTEST_HAS_POSIX_RE=0',
|
||||
# Chrome doesn't support / require C++11, yet.
|
||||
'GTEST_LANG_CXX11=0',
|
||||
'GTEST_LANG_CXX11=1',
|
||||
],
|
||||
'all_dependent_settings': {
|
||||
'defines': [
|
||||
'GTEST_HAS_POSIX_RE=0',
|
||||
'GTEST_LANG_CXX11=0',
|
||||
'GTEST_LANG_CXX11=1',
|
||||
],
|
||||
},
|
||||
'conditions': [
|
||||
['os_posix == 1', {
|
||||
'defines': [
|
||||
# gtest isn't able to figure out when RTTI is disabled for gcc
|
||||
# versions older than 4.3.2, and assumes it's enabled. Our Mac
|
||||
# and Linux builds disable RTTI, and cannot guarantee that the
|
||||
# compiler will be 4.3.2. or newer. The Mac, for example, uses
|
||||
# 4.2.1 as that is the latest available on that platform. gtest
|
||||
# must be instructed that RTTI is disabled here, and for any
|
||||
# direct dependents that might include gtest headers.
|
||||
'GTEST_HAS_RTTI=0',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'defines': [
|
||||
'GTEST_HAS_RTTI=0',
|
||||
],
|
||||
},
|
||||
}],
|
||||
['OS=="android"', {
|
||||
'defines': [
|
||||
'GTEST_HAS_CLONE=0',
|
||||
@ -90,25 +72,6 @@
|
||||
],
|
||||
},
|
||||
}],
|
||||
['OS=="android"', {
|
||||
# We want gtest features that use tr1::tuple, but we currently
|
||||
# don't support the variadic templates used by libstdc++'s
|
||||
# implementation. gtest supports this scenario by providing its
|
||||
# own implementation but we must opt in to it.
|
||||
'defines': [
|
||||
'GTEST_USE_OWN_TR1_TUPLE=1',
|
||||
# GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set.
|
||||
# gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0
|
||||
# automatically on android, so it has to be set explicitly here.
|
||||
'GTEST_HAS_TR1_TUPLE=1',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'defines': [
|
||||
'GTEST_USE_OWN_TR1_TUPLE=1',
|
||||
'GTEST_HAS_TR1_TUPLE=1',
|
||||
],
|
||||
},
|
||||
}],
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
'defines': [
|
||||
|
Loading…
Reference in New Issue
Block a user