diff options
| author | bartus | 2017-12-06 10:22:46 +0100 |
|---|---|---|
| committer | bartus | 2017-12-06 10:22:46 +0100 |
| commit | ae6a6918f42fdb5b4964e8c019c62e9a51bf4ede (patch) | |
| tree | cd444ac3c31619390ab16f54b24301640a685c33 /gtest.patch | |
| parent | 989571da5ba8d0fa361c6ddba2642324c5f42b1f (diff) | |
| download | aur-ae6a6918f42fdb5b4964e8c019c62e9a51bf4ede.tar.gz | |
rollback gtest patch, already in mainline
Diffstat (limited to 'gtest.patch')
| -rw-r--r-- | gtest.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/gtest.patch b/gtest.patch index 3d1ecd463e0d..daff5d78655e 100644 --- a/gtest.patch +++ b/gtest.patch @@ -14,46 +14,4 @@ index f179d48..8927a5c 100644 ${LINK.cc} -o $@ $^ ${LDLIBS} clean: -diff --git a/tests/Makefile b/tests/Makefile -index 69269b6..e043727 100644 ---- a/smvs/tests/Makefile -+++ b/smvs/tests/Makefile -@@ -6,9 +6,9 @@ SOURCES = $(wildcard gtest_*.cc) - INCLUDES = -I../lib -I${MVE_ROOT}/libs -I${GTEST_PATH}/include - CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare - CXXFLAGS = -std=c++11 -pthread ${CXXWARNINGS} ${INCLUDES} --LDLIBS += -lpng -ltiff -ljpeg -+LDLIBS += -lpng -ltiff -ljpeg -lgtest -lgtest_main - --test: ${SOURCES:.cc=.o} libsmvs.a libmve.a libmve_util.a gtest_main.a -+test: ${SOURCES:.cc=.o} libsmvs.a libmve.a libmve_util.a - ${LINK.cc} -o $@ $^ ${LDLIBS} - - clean: -diff --git a/smvs/tests/gtest_correspondence.cc b/tests/gtest_correspondence.cc -index fcb6a50..a8e2da4 100644 ---- a/smvs/tests/gtest_correspondence.cc -+++ b/smvs/tests/gtest_correspondence.cc -@@ -365,8 +365,8 @@ TEST(CorrespondenceJacobianTest, ValuesAndDerivatives) - corr_new[0] -= 0.5; - corr_new[1] -= 0.5; - diff = (corr_new - corr_base) / delta; -- EXPECT_NEAR(corr_jac[0], diff[0], 1e-4); -- EXPECT_NEAR(corr_jac[1], diff[1], 1e-4); -+ EXPECT_NEAR(corr_jac[0], diff[0], 2e-4); -+ EXPECT_NEAR(corr_jac[1], diff[1], 2e-4); - x = backup; - - backup = y; -@@ -377,8 +377,8 @@ TEST(CorrespondenceJacobianTest, ValuesAndDerivatives) - corr_new[0] -= 0.5; - corr_new[1] -= 0.5; - diff = (corr_new - corr_base) / delta; -- EXPECT_NEAR(corr_jac[2], diff[0], 1e-4); -- EXPECT_NEAR(corr_jac[3], diff[1], 1e-4); -+ EXPECT_NEAR(corr_jac[2], diff[0], 2e-4); -+ EXPECT_NEAR(corr_jac[3], diff[1], 2e-4); - y = backup; - - #if 1 |