Auto merge of #2751 - syd0:upgrade-googletest-1.8.0, r=str4d
Upgrade googletest to 1.8.0 Closes #1432.
This commit is contained in:
commit
2ff8ab7dfb
|
@ -1,20 +0,0 @@
|
||||||
# url=https://github.com/google/googlemock/archive/release-1.7.0.tar.gz
|
|
||||||
|
|
||||||
package=googlemock
|
|
||||||
$(package)_version=1.7.0
|
|
||||||
$(package)_dependencies=googletest
|
|
||||||
|
|
||||||
$(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=3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232
|
|
||||||
|
|
||||||
define $(package)_build_cmds
|
|
||||||
$(MAKE) -C make GTEST_DIR='$(host_prefix)' CXXFLAGS='-fPIC' gmock-all.o
|
|
||||||
endef
|
|
||||||
|
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
|
||||||
install -D ./make/gmock-all.o $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
|
|
||||||
cp -a ./include $($(package)_staging_dir)$(host_prefix)/include
|
|
||||||
endef
|
|
|
@ -1,15 +1,18 @@
|
||||||
package=googletest
|
package=googletest
|
||||||
$(package)_version=1.7.0
|
$(package)_version=1.8.0
|
||||||
$(package)_download_path=https://github.com/google/$(package)/archive/
|
$(package)_download_path=https://github.com/google/$(package)/archive/
|
||||||
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||||
$(package)_download_file=release-$($(package)_version).tar.gz
|
$(package)_download_file=release-$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc
|
$(package)_sha256_hash=58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
$(MAKE) -C make CXXFLAGS=-fPIC gtest.a
|
$(MAKE) -C googlemock/make CXXFLAGS=-fPIC gmock.a && \
|
||||||
|
$(MAKE) -C googletest/make CXXFLAGS=-fPIC gtest.a
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_stage_cmds
|
define $(package)_stage_cmds
|
||||||
install -D ./make/gtest.a $($(package)_staging_dir)$(host_prefix)/lib/libgtest.a && \
|
install -D ./googlemock/make/gmock.a $($(package)_staging_dir)$(host_prefix)/lib/libgmock.a && \
|
||||||
cp -a ./include $($(package)_staging_dir)$(host_prefix)/include
|
install -D ./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)/
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
rust_packages := rust librustzcash
|
rust_packages := rust librustzcash
|
||||||
proton_packages := proton
|
proton_packages := proton
|
||||||
zcash_packages := libgmp libsodium
|
zcash_packages := libgmp libsodium
|
||||||
packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock
|
packages := boost openssl libevent zeromq $(zcash_packages) googletest
|
||||||
native_packages := native_ccache
|
native_packages := native_ccache
|
||||||
|
|
||||||
wallet_packages=bdb
|
wallet_packages=bdb
|
||||||
|
|
|
@ -46,7 +46,7 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
|
||||||
collate-libsnark: $(LIBSNARK)
|
collate-libsnark: $(LIBSNARK)
|
||||||
|
|
||||||
LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1
|
LIBSNARK_CXXFLAGS = -fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1
|
||||||
LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1
|
LIBSNARK_CONFIG_FLAGS = CURVE=ALT_BN128 MULTICORE=1 NO_PROCPS=1 NO_DOCS=1 STATIC=1 NO_SUPERCOP=1 FEATUREFLAGS=-DMONTGOMERY_OUTPUT NO_COPY_DEPINST=1 NO_COMPILE_LIBGTEST=1
|
||||||
|
|
||||||
$(LIBSNARK): $(wildcard snark/src/*)
|
$(LIBSNARK): $(wildcard snark/src/*)
|
||||||
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"
|
$(AM_V_at) CXXFLAGS="$(LIBSNARK_CXXFLAGS)" $(MAKE) $(AM_MAKEFLAGS) -C snark/ install PREFIX=$(srcdir)/build DEPINST="$(LIBSNARK_DEPINST)" $(LIBSNARK_CONFIG_FLAGS) OPTFLAGS="-O2 -march=x86-64"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "gtest/gtest.h"
|
#include "gmock/gmock.h"
|
||||||
#include "crypto/common.h"
|
#include "crypto/common.h"
|
||||||
#include "pubkey.h"
|
#include "pubkey.h"
|
||||||
#include "zcash/JoinSplit.hpp"
|
#include "zcash/JoinSplit.hpp"
|
||||||
|
@ -25,6 +25,6 @@ int main(int argc, char **argv) {
|
||||||
boost::filesystem::path vk_path = ZC_GetParamsDir() / "sprout-verifying.key";
|
boost::filesystem::path vk_path = ZC_GetParamsDir() / "sprout-verifying.key";
|
||||||
params = ZCJoinSplit::Prepared(vk_path.string(), pk_path.string());
|
params = ZCJoinSplit::Prepared(vk_path.string(), pk_path.string());
|
||||||
|
|
||||||
testing::InitGoogleTest(&argc, argv);
|
testing::InitGoogleMock(&argc, argv);
|
||||||
return RUN_ALL_TESTS();
|
return RUN_ALL_TESTS();
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ depinst/
|
||||||
depsrc/
|
depsrc/
|
||||||
README.html
|
README.html
|
||||||
doxygen/
|
doxygen/
|
||||||
|
src/gtests
|
||||||
src/gadgetlib2/examples/tutorial
|
src/gadgetlib2/examples/tutorial
|
||||||
src/gadgetlib2/tests/gadgetlib2_test
|
src/gadgetlib2/tests/gadgetlib2_test
|
||||||
|
|
||||||
|
|
|
@ -27,13 +27,13 @@ INSTALL_LIBS = $(LIB_FILE)
|
||||||
# Sentinel file to check existence of this directory (since directories don't work as a Make dependency):
|
# Sentinel file to check existence of this directory (since directories don't work as a Make dependency):
|
||||||
DEPINST_EXISTS = $(DEPINST)/.exists
|
DEPINST_EXISTS = $(DEPINST)/.exists
|
||||||
|
|
||||||
|
|
||||||
COMPILE_GTEST :=
|
|
||||||
ifneq ($(NO_GTEST),1)
|
ifneq ($(NO_GTEST),1)
|
||||||
|
# Compile GTest from sourcecode if we can (e.g., Ubuntu). Otherwise use precompiled one (e.g., Fedora).
|
||||||
|
# See https://github.com/google/googletest/blob/master/googletest/docs/FAQ.md#why-is-it-not-recommended-to-install-a-pre-compiled-copy-of-google-test-for-example-into-usrlocal
|
||||||
|
ifneq ($(NO_COMPILE_LIBGTEST),1)
|
||||||
GTESTDIR=/usr/src/gtest
|
GTESTDIR=/usr/src/gtest
|
||||||
# Compile GTest from sourcecode if we can (e.g., Ubuntu). Otherwise use precompiled one (e.g., Fedora).
|
COMPILE_LIBGTEST = $(shell test -d $(GTESTDIR) && echo -n 1)
|
||||||
# See https://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog .
|
endif
|
||||||
COMPILE_GTEST :=$(shell test -d $(GTESTDIR) && echo -n 1)
|
|
||||||
GTEST_LDLIBS += -lgtest -lpthread
|
GTEST_LDLIBS += -lgtest -lpthread
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -221,13 +221,13 @@ src/gadgetlib2/tests/gadgetlib2_test: \
|
||||||
$(EXECUTABLES): %: %.o $(LIBSNARK_A) $(DEPINST_EXISTS)
|
$(EXECUTABLES): %: %.o $(LIBSNARK_A) $(DEPINST_EXISTS)
|
||||||
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
|
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
|
||||||
|
|
||||||
$(EXECUTABLES_WITH_GTEST): %: %.o $(LIBSNARK_A) $(if $(COMPILE_GTEST),$(LIBGTEST_A)) $(DEPINST_EXISTS)
|
$(EXECUTABLES_WITH_GTEST): %: %.o $(LIBSNARK_A) $(if $(COMPILE_LIBGTEST),$(LIBGTEST_A)) $(DEPINST_EXISTS)
|
||||||
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(GTEST_LDLIBS) $(LDLIBS)
|
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(GTEST_LDLIBS) $(LDLIBS)
|
||||||
|
|
||||||
$(EXECUTABLES_WITH_SUPERCOP): %: %.o $(LIBSNARK_A) $(DEPINST_EXISTS)
|
$(EXECUTABLES_WITH_SUPERCOP): %: %.o $(LIBSNARK_A) $(DEPINST_EXISTS)
|
||||||
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(SUPERCOP_LDLIBS) $(LDLIBS)
|
$(CXX) -o $@ $@.o $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(SUPERCOP_LDLIBS) $(LDLIBS)
|
||||||
|
|
||||||
$(GTEST_TESTS): %: $(GTEST_OBJS) $(LIBSNARK_A) $(if $(COMPILE_GTEST),$(LIBGTEST_A)) $(DEPINST_EXISTS)
|
$(GTEST_TESTS): %: $(GTEST_OBJS) $(LIBSNARK_A) $(if $(COMPILE_LIBGTEST),$(LIBGTEST_A)) $(DEPINST_EXISTS)
|
||||||
$(CXX) -o $@ $(GTEST_OBJS) $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(GTEST_LDLIBS) $(LDLIBS)
|
$(CXX) -o $@ $(GTEST_OBJS) $(LIBSNARK_A) $(CXXFLAGS) $(LDFLAGS) $(GTEST_LDLIBS) $(LDLIBS)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue