[gnome-commander/googletest] Added googletest for testing via "make check"
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/googletest] Added googletest for testing via "make check"
- Date: Sun, 11 Oct 2015 20:34:53 +0000 (UTC)
commit 3c393a1d540fc191e3b82c195346297bbb695ac8
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sun Oct 11 22:34:13 2015 +0200
Added googletest for testing via "make check"
configure.ac | 35 +++++++++++++++++++++++++++++------
tests/Makefile.am | 25 ++++++++++++++++++++++++-
2 files changed, 53 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index df4cb68..4fc2a62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,6 @@ EXIV2_REQ=0.14
TAGLIB_REQ=1.4
LIBGSF_REQ=1.12.0
POPPLER_REQ=0.18
-CPPUNIT_REQ=1.13.1
AC_SUBST(GLIB_REQ)
AC_SUBST(GTK_REQ)
@@ -292,13 +291,37 @@ fi
dnl =====================
-dnl Check for CppUnit
+dnl Google Test
dnl =====================
-PKG_CHECK_MODULES(CPPUNIT, [cppunit >= $CPPUNIT_REQ],,[AC_MSG_RESULT([no, testing is disabled])])
-AM_CONDITIONAL(HAVE_CPPUNIT, [test "x$CHECK_LIBS" != "x"])
-AC_SUBST(CHECK_CFLAGS)
-AC_SUBST(CHECK_LIBS)
+# Configure pthreads.
+# ACX_PTHREAD([have_pthread=yes])
+
+# Define gtest variables
+if test "x$have_pthread" = "xyes"; then
+GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"
+GTEST_CXXFLAGS="$PTHREAD_CFLAGS"
+GTEST_LDFLAGS=
+GTEST_LIBS="$PTHREAD_LIBS"
+else
+GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"
+GTEST_CXXFLAGS=
+GTEST_LDFLAGS=
+GTEST_LIBS=
+fi
+AC_SUBST([GTEST_CPPFLAGS])
+AC_SUBST([GTEST_CXXFLAGS])
+AC_SUBST([GTEST_LDFLAGS])
+AC_SUBST([GTEST_LIBS])
+
+AC_MSG_RESULT([
+Google Test is now configured (for \"make check\")
+
+ GTEST_CPPFLAGS : $GTEST_CPPFLAGS
+ GTEST_CXXFLAGS : $GTEST_CXXFLAGS
+ GTEST_LDFLAGS : $GTEST_LDFLAGS
+ GTEST_LIBS : $GTEST_LIBS
+])
dnl =============================
dnl Checks for library functions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d323033..f17559e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,26 @@
-SUBDIRS =
+SUBDIRS =
+
+AM_CPPFLAGS = \
+ $(CC_WARNINGS) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
+ $(GTEST_CPPFLAGS) \
+ -I$(top_builddir)/src
+
+INTVLIBS = \
+ $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(GNOMEUI_LIBS) \
+ $(top_builddir)/src/intviewer/libgviewer.a
+
+TESTS =
+
+TESTS += func_test
+check_PROGRAMS += func_test
+func_test_SOURCES = run_tests.cpp fileops.cpp
+
+func_test_CXXFLAGS = $(INTVLIBS)
+func_test_LDFLAGS = $(INTVLIBS) -lgtest
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]