You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jc...@apache.org on 2017/06/20 23:42:12 UTC
svn commit: r1799378 - in /httpd/httpd/trunk: ./ CMakeLists.txt Makefile.in
build/httpdunit_gen_cases.pl build/httpdunit_gen_stubs.pl build/rules.mk.in
configure.in modules/generators/config5.m4 test/httpdunit.c
test/httpdunit.h test/unit/
Author: jchampion
Date: Tue Jun 20 23:42:12 2017
New Revision: 1799378
URL: http://svn.apache.org/viewvc?rev=1799378&view=rev
Log:
httpdunit: merge to trunk from feature branch
Added:
httpd/httpd/trunk/build/httpdunit_gen_cases.pl
- copied unchanged from r1799377, httpd/httpd/branches/httpdunit/build/httpdunit_gen_cases.pl
httpd/httpd/trunk/build/httpdunit_gen_stubs.pl
- copied unchanged from r1799377, httpd/httpd/branches/httpdunit/build/httpdunit_gen_stubs.pl
httpd/httpd/trunk/test/httpdunit.c
- copied unchanged from r1799377, httpd/httpd/branches/httpdunit/test/httpdunit.c
httpd/httpd/trunk/test/httpdunit.h
- copied unchanged from r1799377, httpd/httpd/branches/httpdunit/test/httpdunit.h
httpd/httpd/trunk/test/unit/
- copied from r1799377, httpd/httpd/branches/httpdunit/test/unit/
Modified:
httpd/httpd/trunk/ (props changed)
httpd/httpd/trunk/CMakeLists.txt
httpd/httpd/trunk/Makefile.in
httpd/httpd/trunk/build/rules.mk.in
httpd/httpd/trunk/configure.in
httpd/httpd/trunk/modules/generators/config5.m4
Propchange: httpd/httpd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 20 23:42:12 2017
@@ -1,3 +1,4 @@
+/httpd/httpd/branches/httpdunit:1796198-1799377
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/trunk-buildconf-noapr:1780253-1795930
/httpd/httpd/branches/trunk-openssl-threadid:1791053-1791848
Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1799378&r1=1799377&r2=1799378&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Tue Jun 20 23:42:12 2017
@@ -64,6 +64,12 @@ ELSE()
SET(default_brotli_libraries)
ENDIF()
+IF(EXISTS "${CMAKE_INSTALL_PREFIX}/lib/check.lib")
+ SET(default_check_libraries "${CMAKE_INSTALL_PREFIX}/lib/check.lib" "${CMAKE_INSTALL_PREFIX}/lib/compat.lib")
+ELSE()
+ SET(default_check_libraries)
+ENDIF()
+
SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR[-Util] include files")
SET(APR_LIBRARIES ${default_apr_libraries} CACHE STRING "APR libraries to link with")
SET(NGHTTP2_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with NGHTTP2 include files within nghttp2 subdirectory")
@@ -74,6 +80,8 @@ SET(LIBXML2_ICONV_INCLUDE_DIR ""
SET(LIBXML2_ICONV_LIBRARIES "" CACHE STRING "iconv libraries to link with for libxml2")
SET(BROTLI_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with include files for Brotli")
SET(BROTLI_LIBRARIES ${default_brotli_libraries} CACHE STRING "Brotli libraries to link with")
+SET(CHECK_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with include files for Check")
+SET(CHECK_LIBRARIES "${default_check_libraries}" CACHE STRING "Check libraries to link with")
# end support library configuration
# Misc. options
@@ -211,6 +219,18 @@ ELSE()
SET(BROTLI_FOUND FALSE)
ENDIF()
+# See if we have Check
+SET(CHECK_FOUND TRUE)
+IF (EXISTS "${CHECK_INCLUDE_DIR}/check.h")
+ FOREACH(onelib ${CHECK_LIBRARIES})
+ IF(NOT EXISTS "${onelib}")
+ SET(CHECK_FOUND FALSE)
+ ENDIF()
+ ENDFOREACH()
+ELSE()
+ SET(CHECK_FOUND FALSE)
+ENDIF()
+
MESSAGE(STATUS "")
MESSAGE(STATUS "Summary of feature detection:")
MESSAGE(STATUS "")
@@ -220,6 +240,7 @@ MESSAGE(STATUS "NGHTTP2_FOUND ..........
MESSAGE(STATUS "OPENSSL_FOUND ............ : ${OPENSSL_FOUND}")
MESSAGE(STATUS "ZLIB_FOUND ............... : ${ZLIB_FOUND}")
MESSAGE(STATUS "BROTLI_FOUND ............. : ${BROTLI_FOUND}")
+MESSAGE(STATUS "CHECK_FOUND .............. : ${CHECK_FOUND}")
MESSAGE(STATUS "APR_HAS_LDAP ............. : ${APR_HAS_LDAP}")
MESSAGE(STATUS "APR_HAS_XLATE ............ : ${APR_HAS_XLATE}")
MESSAGE(STATUS "APU_HAVE_CRYPTO .......... : ${APU_HAVE_CRYPTO}")
@@ -884,6 +905,50 @@ IF(OPENSSL_FOUND)
ENDIF()
GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES)
+# Unit Test Suite
+IF(CHECK_FOUND)
+ # Get all of the test cases.
+ # XXX Per CMake documentation, if a test case is added or removed we must
+ # re-run CMake due to our use of GLOB. TBD if this tradeoff to have
+ # "plug-and-play" test cases is really worth it.
+ FILE(GLOB httpdunit_cases "${CMAKE_SOURCE_DIR}/test/unit/*.c")
+
+ ADD_EXECUTABLE(httpdunit
+ test/httpdunit.c
+ ${httpdunit_cases})
+ SET_TARGET_PROPERTIES(httpdunit PROPERTIES
+ INCLUDE_DIRECTORIES "${HTTPD_INCLUDE_DIRECTORIES} ${CHECK_INCLUDE_DIR}"
+ # FIXME why does Check need HAVE_STDINT_H on Windows?
+ COMPILE_FLAGS "-DHAVE_STDINT_H")
+ TARGET_LINK_LIBRARIES(httpdunit libhttpd ${APR_LIBRARIES} ${CHECK_LIBRARIES})
+
+ # Rules for generating the .tests stubs.
+ FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/httpdunit_gen_stubs.bat"
+ CONTENT "perl \"${CMAKE_SOURCE_DIR}/build/httpdunit_gen_stubs.pl\" < %1 > %2")
+ FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/test/unit")
+
+ FOREACH(case ${httpdunit_cases})
+ STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}"
+ stub "${case}")
+ STRING(REGEX REPLACE "\\.c$" ".tests"
+ stub "${stub}")
+
+ ADD_CUSTOM_COMMAND(TARGET httpdunit
+ PRE_BUILD
+ COMMAND "${CMAKE_BINARY_DIR}/httpdunit_gen_stubs.bat" "\"${case}\"" "\"${stub}\""
+ BYPRODUCTS "${stub}")
+ ENDFOREACH()
+
+ # Rule for generating the .cases file.
+ FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/httpdunit_gen_cases.bat"
+ CONTENT "type \"${CMAKE_SOURCE_DIR}\"\\test\\unit\\*.c 2>NUL | perl \"${CMAKE_SOURCE_DIR}/build/httpdunit_gen_cases.pl\" --declaration > \"${CMAKE_BINARY_DIR}/test/httpdunit.cases\"
+ type \"${CMAKE_SOURCE_DIR}\"\\test\\unit\\*.c 2>NUL | perl \"${CMAKE_SOURCE_DIR}/build/httpdunit_gen_cases.pl\" >> \"${CMAKE_BINARY_DIR}/test/httpdunit.cases\"")
+ ADD_CUSTOM_COMMAND(TARGET httpdunit
+ PRE_BUILD
+ COMMAND "${CMAKE_BINARY_DIR}/httpdunit_gen_cases.bat"
+ BYPRODUCTS "${CMAKE_BINARY_DIR}/test/httpdunit.cases")
+ENDIF()
+
# getting duplicate manifest error with ApacheMonitor
# ADD_EXECUTABLE(ApacheMonitor support/win32/ApacheMonitor.c support/win32/ApacheMonitor.rc)
# SET(install_targets ${install_targets} ApacheMonitor)
@@ -991,6 +1056,8 @@ MESSAGE(STATUS " libxml2 iconv prereq i
MESSAGE(STATUS " libxml2 iconv prereq libraries .. : ${LIBXML2_ICONV_LIBRARIES}")
MESSAGE(STATUS " Brotli include directory......... : ${BROTLI_INCLUDE_DIR}")
MESSAGE(STATUS " Brotli libraries ................ : ${BROTLI_LIBRARIES}")
+MESSAGE(STATUS " Check include directory.......... : ${CHECK_INCLUDE_DIR}")
+MESSAGE(STATUS " Check libraries ................. : ${CHECK_LIBRARIES}")
MESSAGE(STATUS " Extra include directories ....... : ${EXTRA_INCLUDES}")
MESSAGE(STATUS " Extra compile flags ............. : ${EXTRA_COMPILE_FLAGS}")
MESSAGE(STATUS " Extra libraries ................. : ${EXTRA_LIBS}")
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1799378&r1=1799377&r2=1799378&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Tue Jun 20 23:42:12 2017
@@ -20,7 +20,8 @@ INSTALL_TARGETS = install-conf install-h
CLEAN_TARGETS = check/apxs check/build/config_vars.mk \
check/conf/$(PROGRAM_NAME).conf check/conf/magic check/conf/mime.types \
- check/conf/extra/* check/include/*
+ check/conf/extra/* check/include/* $(testcase_OBJECTS) $(testcase_STUBS) \
+ test/httpdunit.cases test/unit/*.o
DISTCLEAN_TARGETS = include/ap_config_auto.h include/ap_config_layout.h \
include/apache_probes.h \
modules.c config.cache config.log config.status build/config_vars.mk \
@@ -28,7 +29,7 @@ DISTCLEAN_TARGETS = include/ap_config_a
build/pkg/pkginfo build/config_vars.sh bsd_converted
EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
httpd.spec
-PHONY_TARGETS := check check-conf check-dirs check-include
+PHONY_TARGETS := check check-conf check-dirs check-include unittest-objdir
include $(top_builddir)/build/rules.mk
include $(top_srcdir)/build/program.mk
@@ -431,3 +432,38 @@ check: check-include check-dirs check-co
./t/TEST -clean && \
./t/TEST -config && \
./t/TEST
+
+#
+# Unit Test Suite
+#
+
+# Make sure the object subdirectories we use exist in the build directory during
+# VPATH builds.
+unittest-objdir:
+ @mkdir -p test/unit
+
+# Normally I don't like wildcard sources, but for tests, autodiscovery is the
+# way to go.
+testcase_SOURCES := $(patsubst $(top_srcdir)/%,%,$(wildcard $(top_srcdir)/test/unit/*.c))
+testcase_OBJECTS := $(testcase_SOURCES:%.c=%.lo)
+testcase_STUBS := $(testcase_SOURCES:%.c=%.tests)
+
+# Each testcase depends on the source file as well as the autogenerated .tests
+# stub.
+$(testcase_OBJECTS): %.lo: %.c %.tests | unittest-objdir
+
+$(testcase_STUBS): %.tests: %.c
+ $(top_srcdir)/build/httpdunit_gen_stubs.pl < "$<" > "$@"
+
+test/httpdunit.cases: $(testcase_SOURCES) | unittest-objdir
+ cat $^ | $(top_srcdir)/build/httpdunit_gen_cases.pl --declaration > $@
+ cat $^ | $(top_srcdir)/build/httpdunit_gen_cases.pl >> $@
+
+test/httpdunit.lo: test/httpdunit.c test/httpdunit.cases | unittest-objdir
+
+# httpdunit is only added to $(other_targets) if configure detects a working
+# libcheck on the system.
+httpdunit_OBJECTS := test/httpdunit.lo $(testcase_OBJECTS)
+$(httpdunit_OBJECTS): override LTCFLAGS += $(UNITTEST_CFLAGS)
+test/httpdunit: $(httpdunit_OBJECTS) $(PROGRAM_DEPENDENCIES) $(PROGRAM_OBJECTS)
+ $(LINK) $(httpdunit_OBJECTS) $(PROGRAM_OBJECTS) $(UNITTEST_LIBS) $(PROGRAM_LDADD)
Modified: httpd/httpd/trunk/build/rules.mk.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rules.mk.in?rev=1799378&r1=1799377&r2=1799378&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rules.mk.in (original)
+++ httpd/httpd/trunk/build/rules.mk.in Tue Jun 20 23:42:12 2017
@@ -44,8 +44,8 @@ CXX_COMPILE = $(BASE_CXX) $(PICFLAGS)
SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) $(SHLTCFLAGS) -c $< && touch $@
SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CXX) $(SHLTCFLAGS) -c $< && touch $@
-LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(LTCFLAGS) -c $< && touch $@
-LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) $(LTCFLAGS) -c $< && touch $@
+LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(LTCFLAGS) -c $< -o $@
+LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) $(LTCFLAGS) -c $< -o $@
# Link-related commands
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1799378&r1=1799377&r2=1799378&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Jun 20 23:42:12 2017
@@ -706,6 +706,22 @@ AC_ARG_WITH(valgrind,
fi ]
)
+dnl Enable the unit test executable if Check is installed.
+dnl TODO: at the moment, only pkg-config discovery is supported.
+AC_MSG_CHECKING([for Check to enable unit tests])
+if test "x$PKGCONFIG" != "x" && `$PKGCONFIG --atleast-version='0.9.12' check`; then
+ UNITTEST_CFLAGS=`$PKGCONFIG --cflags check`
+ UNITTEST_LIBS=`$PKGCONFIG --libs check`
+ other_targets="$other_targets test/httpdunit"
+
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
+APACHE_SUBST(UNITTEST_CFLAGS)
+APACHE_SUBST(UNITTEST_LIBS)
+
+
prefix="$orig_prefix"
APACHE_ENABLE_MODULES
Modified: httpd/httpd/trunk/modules/generators/config5.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/config5.m4?rev=1799378&r1=1799377&r2=1799378&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/config5.m4 (original)
+++ httpd/httpd/trunk/modules/generators/config5.m4 Tue Jun 20 23:42:12 2017
@@ -9,7 +9,7 @@ APACHE_MODULE(autoindex, directory listi
APACHE_MODULE(asis, as-is filetypes, , , )
APACHE_MODULE(info, server information, , , most)
APACHE_MODULE(suexec, set uid and gid for spawned processes, , , no, [
- other_targets=suexec ] )
+ other_targets="$other_targets suexec" ] )
# Is mod_cgid needed?
case $host in