Author: billblough
Date: Sun Jan 7 02:07:26 2018
New Revision: 1820434
URL: http://svn.apache.org/viewvc?rev=1820434&view=rev
Log:
Add support for Google Test Framework
Add support for using out-of-tree copy of gtest by using the
--with-gtest=<path> configure flag, where <path> is the path to the
gtest source directory. The gtest libs will be compiled and copied into
the working tree.
JIRA: AXIS2C-1691
Added:
axis/axis2/c/core/trunk/gtest/
axis/axis2/c/core/trunk/gtest/Makefile.am (with props)
Modified:
axis/axis2/c/core/trunk/Makefile.am
axis/axis2/c/core/trunk/configure.ac
Modified: axis/axis2/c/core/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/Makefile.am?rev=1820434&r1=1820433&r2=1820434&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/Makefile.am (original)
+++ axis/axis2/c/core/trunk/Makefile.am Sun Jan 7 02:07:26 2018
@@ -22,7 +22,7 @@ wsdl2cdir=$(prefix)/bin/tools/wsdl2c
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = axis2c.pc
-SUBDIRS = util $(GUTHTHILA_DIR) axiom neethi src $(TESTDIR) include ides
tools/tcpmon tools/md5
+SUBDIRS = $(GTEST) util $(GUTHTHILA_DIR) axiom neethi src $(TESTDIR) include
ides tools/tcpmon tools/md5
include_HEADERS=$(top_builddir)/include/*.h
data_DATA= samples/server/axis2.xml README \
INSTALL CREDITS COPYING NEWS NOTICE AUTHORS
Modified: axis/axis2/c/core/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/configure.ac?rev=1820434&r1=1820433&r2=1820434&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/configure.ac (original)
+++ axis/axis2/c/core/trunk/configure.ac Sun Jan 7 02:07:26 2018
@@ -378,6 +378,27 @@ AC_ARG_WITH(apr,
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(whether to use use the Google test framework)
+AC_ARG_WITH(gtest,
+ [ --with-gtest[=PATH] Find the gtest source files in
'PATH'.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ USE_GTEST=""
+ GTEST_DIR=""
+ GTEST=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ GTEST_DIR="$withval"
+ GTEST="gtest"
+ CXXFLAGS="$CXXFLAGS -g -Wall -Wextra -pthread"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+
AC_MSG_CHECKING(whether to build tests)
AC_ARG_ENABLE(tests, [ --enable-tests
build tests (default=no)],
@@ -554,6 +575,8 @@ AC_SUBST(OPENSSLLIB)
AC_SUBST(APRINC)
AC_SUBST(DICLIENT_DIR)
AC_SUBST(TESTDIR)
+AC_SUBST(GTEST_DIR)
+AC_SUBST(GTEST)
AC_SUBST(SAMPLES)
AC_SUBST(APACHE2BUILD)
AC_SUBST(NTLM_CFLAGS)
@@ -624,6 +647,7 @@ AC_CONFIG_FILES([Makefile \
src/modules/Makefile \
src/modules/mod_addr/Makefile \
src/modules/mod_log/Makefile \
+ gtest/Makefile \
test/Makefile \
test/core/Makefile \
test/core/description/Makefile \
Added: axis/axis2/c/core/trunk/gtest/Makefile.am
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/gtest/Makefile.am?rev=1820434&view=auto
==============================================================================
--- axis/axis2/c/core/trunk/gtest/Makefile.am (added)
+++ axis/axis2/c/core/trunk/gtest/Makefile.am Sun Jan 7 02:07:26 2018
@@ -0,0 +1,14 @@
+
+noinst_LIBRARIES = libgtest.a libgtest_main.a
+
+libgtest_a_SOURCES = $(GTEST_DIR)/src/gtest-all.cc
+libgtest_a_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
+libgtest_a_CXXFLAGS = -g -Wall -Wextra
+libgtest_a_LDFLAGS = -pthread
+
+libgtest_main_a_SOURCES = $(GTEST_DIR)/src/gtest_main.cc
+libgtest_main_CPPFLAGS = -I$(GTEST_DIR)/include -I$(GTEST_DIR)
+libgtest_main_a_CXXFLAGS = -g -Wall -Wextra
+libgtest_main_LDFLAGS = -pthread
+libgtest_main_a_LIBADD = libgtest.a
+
Propchange: axis/axis2/c/core/trunk/gtest/Makefile.am
------------------------------------------------------------------------------
svn:eol-style = native
