[sword-svn] r3656 - in trunk: cmake tests tests/testsuite

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2019-06-13 11:51:58 -0700 (Thu, 13 Jun 2019)
New Revision: 3656

Modified:
   trunk/cmake/build-debug.sh
   trunk/cmake/muxsources.cmake
   trunk/tests/CMakeLists.txt
   trunk/tests/testsuite/CMakeLists.txt
Log:
Update CMake test builds


Modified: trunk/cmake/build-debug.sh
===================================================================
--- trunk/cmake/build-debug.sh	2019-06-13 14:53:25 UTC (rev 3655)
+++ trunk/cmake/build-debug.sh	2019-06-13 18:51:58 UTC (rev 3656)
@@ -8,13 +8,14 @@
 cd build
 # Configure with Python and Perl bindings, examples, tests and a debug build into
 # a shared library
-cmake -DSWORD_BINDINGS="Python Perl" \
+cmake \ #-DSWORD_BINDINGS="Python Perl" \
 	-DSWORD_BUILD_EXAMPLES="Yes" \
 	-DSWORD_BUILD_TESTS="Yes" \
 	-DLIBSWORD_LIBRARY_TYPE="Shared" \
 	-DCMAKE_BUILD_TYPE="Debug" .. \
 	-DCMAKE_INSTALL_PREFIX="~/"
 make -j10
+make -j3 tests
 cd ..
 
 echo "Now the library has been built, along with the Perl and Python bindings. \

Modified: trunk/cmake/muxsources.cmake
===================================================================
--- trunk/cmake/muxsources.cmake	2019-06-13 14:53:25 UTC (rev 3655)
+++ trunk/cmake/muxsources.cmake	2019-06-13 18:51:58 UTC (rev 3656)
@@ -88,15 +88,15 @@
 ENDIF(NOT PKG_CONFIG_FOUND)
 
 # ICU needs some lovin' too
-IF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+IF(ICU_FOUND AND NOT SWORD_NO_ICU)
 	MESSAGE(STATUS "ICU: yes ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}")
 	ADD_DEFINITIONS(-D_ICU_)
 	SET(sword_SOURCES ${sword_SOURCES} ${sword_icu_found_SOURCES})
 	SET(WITH_ICU 1)
-ELSE(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+ELSE()
 	MESSAGE(STATUS "ICU: no")
 	SET(WITH_ICU 0)
-ENDIF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+ENDIF()
 
 # Internal or external regex.h
 IF(REGEX_FOUND)

Modified: trunk/tests/CMakeLists.txt
===================================================================
--- trunk/tests/CMakeLists.txt	2019-06-13 14:53:25 UTC (rev 3655)
+++ trunk/tests/CMakeLists.txt	2019-06-13 18:51:58 UTC (rev 3656)
@@ -22,6 +22,7 @@
 	compnone
 	configtest
 	filtertest
+	httptest
 	introtest
 	indextest
 	keycast

Modified: trunk/tests/testsuite/CMakeLists.txt
===================================================================
--- trunk/tests/testsuite/CMakeLists.txt	2019-06-13 14:53:25 UTC (rev 3655)
+++ trunk/tests/testsuite/CMakeLists.txt	2019-06-13 18:51:58 UTC (rev 3656)
@@ -4,10 +4,12 @@
 
 FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sword.conf" "[Install]\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../")
 
+FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sword.conf"
+	"[Install]\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../")
+
 ADD_CUSTOM_TARGET(
 	tests_configure
 	COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.{sh,good,imp,txt,xml}" "${CMAKE_CURRENT_BINARY_DIR}"
-	COMMAND echo \"[Install]\\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../\" > ${CMAKE_CURRENT_BINARY_DIR}/sword.conf
 	DEPENDS ${test_PROGRAMS}
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )