test: Upgrade to VW GTest

This provides us a slightly modified gtest 1.6
NeoGeographyToolkit · Jan 30, 2012 · 95efdaf · 95efdaf
1 parent c234602
commit 95efdaf
Show file tree

Hide file tree

Showing 15 changed files with 4,077 additions and 1,729 deletions.
diff --git a/config/tests.am b/config/tests.am
@@ -10,10 +10,12 @@ GTEST_DIR = $(top_srcdir)/thirdparty/gtest
 libgtest_la_SOURCES = $(GTEST_DIR)/src/gtest-all.cc $(top_srcdir)/src/test/test_main.cc
 # this empty assignment prevents AM_LDFLAGS from applying to libgtest
 libgtest_la_LDFLAGS =
+libgtest_la_LIBADD = @PKG_CORE_LIBS@ $(PKG_BOOST_FILESYSTEM_LIBS)
 
 check_LTLIBRARIES = libgtest.la
 
-AM_CPPFLAGS += -DTEST_SRCDIR="\"$(top_srcdir)/$(subdir)\"" -I$(GTEST_DIR) -I$(GTEST_DIR)/include -g
+AM_CPPFLAGS += -DTEST_SRCDIR="\"$(abs_top_srcdir)/$(subdir)\"" -DTEST_OBJDIR="\"$(abs_top_builddir)/$(subdir)\"" -isystem $(GTEST_DIR) -isystem $(GTEST_DIR)/include -g @PKG_CORE_CPPFLAGS@
+
 LDADD = libgtest.la
 
 # This makes sure we're using the c++ linker

diff --git a/src/asp/Core/tests/Makefile.am b/src/asp/Core/tests/Makefile.am
@@ -13,8 +13,9 @@ if MAKE_MODULE_CORE
 
 TestErodeView_SOURCES         = TestErodeView.cxx
 TestBlobIndexThreaded_SOURCES = TestBlobIndexThreaded.cxx
+TestThreadedEdgeMask_SOURCES  = TestThreadedEdgeMask.cxx
 
-TESTS = TestErodeView TestBlobIndexThreaded
+TESTS = TestErodeView TestBlobIndexThreaded TestThreadedEdgeMask
 
 endif
 

diff --git a/src/asp/Core/tests/TestBlobIndexThreaded.cxx b/src/asp/Core/tests/TestBlobIndexThreaded.cxx
@@ -4,8 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
 
 #include <vw/FileIO.h>
 #include <vw/Image.h>

diff --git a/src/asp/Core/tests/TestErodeView.cxx b/src/asp/Core/tests/TestErodeView.cxx
@@ -4,8 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
 
 #include <vw/Image/ImageViewRef.h>
 #include <asp/Core/ErodeView.h>

diff --git a/src/asp/IsisIO/tests/TestEphemerisEquations.cxx b/src/asp/IsisIO/tests/TestEphemerisEquations.cxx
@@ -4,8 +4,7 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
 
 #include <asp/IsisIO/PolyEquation.h>
 #include <asp/IsisIO/RPNEquation.h>

diff --git a/src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx b/src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx
@@ -4,12 +4,10 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
 
 #include <asp/IsisIO/IsisAdjustCameraModel.h>
 #include <asp/IsisIO/IsisCameraModel.h>
-#include <test/Helpers.h>
 #include <boost/foreach.hpp>
 
 using namespace vw;

diff --git a/src/asp/IsisIO/tests/TestIsisCameraModel.cxx b/src/asp/IsisIO/tests/TestIsisCameraModel.cxx
@@ -4,14 +4,12 @@
 // All Rights Reserved.
 // __END_LICENSE__
 
-
-#include <gtest/gtest.h>
+#include <test/Helpers.h>
 
 #include <vw/Math/Vector.h>
 #include <vw/Core/Debugging.h>
 #include <asp/IsisIO/IsisCameraModel.h>
 #include <vw/Cartography/SimplePointImageManipulation.h>
-#include <test/Helpers.h>
 #include <boost/foreach.hpp>
 
 // Additional Headers required for ISIS