zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

depends: googletest 1.12.1

This commit is contained in:
Jack Grigg 2021-09-14 22:50:37 +01:00
parent 79e13d571a
commit bbc18d2cb2
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
depends/packages/googletest.mk
View File

@ -1,9 +1,10 @@
package=googletest
$(package)_version=1.8.1
$(package)_version=1.12.1
$(package)_download_path=https://github.com/google/$(package)/archive/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_download_file=release-$($(package)_version).tar.gz
$(package)_sha256_hash=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
$(package)_sha256_hash=81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2
$(package)_build_subdir=build
ifneq ($(host_os),darwin)
$(package)_dependencies=libcxx
@ -22,15 +23,18 @@ endif
endef
define $(package)_preprocess_cmds
mkdir build
endef
define $(package)_config_cmds
$($(package)_cmake) ..
endef
define $(package)_build_cmds
$(MAKE) -C googlemock/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gmock.a && \
$($(package)_build_env) $(MAKE) -C googletest/make CC="$($(package)_cc)" CXX="$($(package)_cxx)" AR="$($(package)_ar)" CXXFLAGS="$($(package)_cxxflags)" gtest.a
$(MAKE)
endef
define $(package)_stage_cmds
mkdir -p $($(package)_staging_dir)$(host_prefix)/lib && \
install ./googlemock/make/gmock.a $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
install ./googletest/make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
cp -a ./googlemock/include $($(package)_staging_dir)$(host_prefix)/ && \
cp -a ./googletest/include $($(package)_staging_dir)$(host_prefix)/
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

6
qa/zcash/postponed-updates.txt
View File

@ -54,9 +54,3 @@ native_clang 15.0.6 2022-12-10
# We're never updating to this version
bdb 18.1.40 2024-02-01
# Google Test 1.10.0 requires adding CMake to the depends system.
googletest 1.10.0 2022-12-10
googletest 1.11.0 2022-12-10
googletest 1.12.0 2022-12-10
googletest 1.12.1 2022-12-10

2
src/wallet/gtest/test_note_selection.cpp
View File

@ -444,7 +444,7 @@ const std::vector<OutputPool> VEC_TO({OutputPool::Transparent, OutputPool::Orcha
const std::vector<OutputPool> VEC_SO({OutputPool::Sapling, OutputPool::Orchard});
const std::vector<OutputPool> VEC_TSO({OutputPool::Transparent, OutputPool::Sapling, OutputPool::Orchard});
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
ExhaustiveCases,
SpendableInputsTest,
::testing::Values(