8000 Merge pull request #530 from wilx/2.0.x · log4cplus/log4cplus@ac98480 · GitHub
[go: up one dir, main page]
Skip to content

Commit ac98480

Browse files
wilxwilx
authored
Merge pull request #530 from wilx/2.0.x
Cherry pick --enable-tests configure script option from master.
2 parents 02f03e5 + d588a58 commit ac98480

File tree

7 files changed

+501
-419
lines changed

7 files changed

+501
-419
lines changed

‎Makefile.am

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,58 @@ include %D%/qt5debugappender/Makefile.am
5050
include %D%/swig/Makefile.common.am
5151
include %D%/swig/python/Makefile.am
5252

53+
if ENABLE_TESTS
5354
include %D%/tests/Makefile.am
55+
endif
56+
if ENABLE_TESTS
5457
include %D%/tests/appender_test/Makefile.am
58+
endif
59+
if ENABLE_TESTS
5560
include %D%/tests/configandwatch_test/Makefile.am
61+
endif
62+
if ENABLE_TESTS
5663
include %D%/tests/customloglevel_test/Makefile.am
64+
endif
65+
if ENABLE_TESTS
5766
include %D%/tests/fileappender_test/Makefile.am
67+
endif
68+
if ENABLE_TESTS
5869
include %D%/tests/filter_test/Makefile.am
70+
endif
71+
if ENABLE_TESTS
5972
include %D%/tests/hierarchy_test/Makefile.am
73+
endif
74+
if ENABLE_TESTS
6075
include %D%/tests/loglog_test/Makefile.am
76+
endif
77+
if ENABLE_TESTS
6178
include %D%/tests/ndc_test/Makefile.am
79+
endif
80+
if ENABLE_TESTS
6281
include %D%/tests/ostream_test/Makefile.am
82+
endif
83+
if ENABLE_TESTS
6384
include %D%/tests/patternlayout_test/Makefile.am
85+
endif
86+
if ENABLE_TESTS
6487
include %D%/tests/performance_test/Makefile.am
88+
endif
89+
if ENABLE_TESTS
6590
include %D%/tests/priority_test/Makefile.am
91+
endif
92+
if ENABLE_TESTS
6693
include %D%/tests/propertyconfig_test/Makefile.am
94+
endif
95+
if ENABLE_TESTS
6796
include %D%/tests/socket_test/Makefile.am
97+
endif
98+
if ENABLE_TESTS
6899
include %D%/tests/thread_test/Makefile.am
100+
endif
101+
if ENABLE_TESTS
69102
include %D%/tests/timeformat_test/Makefile.am
103+
endif
104+
if ENABLE_TESTS
70105
include %D%/tests/unit_tests/Makefile.am
106+
endif
71107

‎Makefile.am.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ src-dirs = { name = simpleserver; };
55
src-dirs = { name = qt4debugappender; };
66
src-dirs = { name = qt5debugappender; };
77
src-dirs = { name = swig; };
8-
src-dirs = { name = tests; };
8+
src-dirs = { name = tests; conditional = ENABLE_TESTS; };

‎Makefile.am.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ noinst_PROGRAMS=
5555
(emit "\n")
5656
(for-each
5757
(lambda (x)
58-
(emit "include %D%/" x "\n"))
58+
(if (not (string-null? (get "conditional")))
59+
(emit "if " (get "conditional") "\n"))
60+
(emit "include %D%/" x "\n")
61+
(if (not (string-null? (get "conditional")))
62+
(emit "endif\n")))
5963
files)))
6064
=][= ENDFOR =]

‎Makefile.in

Lines changed: 420 additions & 417 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@ separate shared library (liblog4cplusqt4debugappender) that implements
207207
`Qt4DebugAppender`. It requires Qt4 and pkg-config to be installed.
208208

209209

210+
`--enable-tests`
211+
---------------------
212+
213+
This option is enabled by default. It enables compilation of test executables.
214+
215+
210216
`--enable-unit-tests`
211217
---------------------
212218

‎configure

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ CXXDEPMODE
737737
ac_ct_CXX
738738
CXXFLAGS
739739
CXX
740+
ENABLE_TESTS_FALSE
741+
ENABLE_TESTS_TRUE
740742
BUILD_WITH_WCHAR_T_SUPPORT
741743
BUILD_WITH_WCHAR_T_SUPPORT_FALSE
742744
BUILD_WITH_WCHAR_T_SUPPORT_TRUE
@@ -864,6 +866,7 @@ enable_thread_pool
864866
enable_release_version
865867
enable_symbols_visibility_options
866868
with_wchar_t_support
869+
enable_tests
867870
enable_unit_tests
868871
enable_lto
869872
enable_profiling
@@ -1555,6 +1558,7 @@ Optional Features:
15551558
Use platform and compiler specific symbols
15561559
visibility options, where they are available.
15571560
[default=yes]
1561+
--enable-tests Enable tests [default=yes]
15581562
--enable-unit-tests Enable unit tests [default=no]
15591563
--enable-lto Enable LTO build [default=no]
15601564
--enable-profiling Compile with profiling compiler options.
@@ -5498,6 +5502,24 @@ fi
54985502
BUILD_WITH_WCHAR_T_SUPPORT=$with_wchar_t_support
54995503

55005504

5505+
# Check whether --enable-tests was given.
5506+
if test ${enable_tests+y}
5507+
then :
5508+
enableval=$enable_tests;
5509+
log4cplus_check_yesno_func "${enableval}" "--enable-tests"
5510+
else $as_nop
5511+
enable_tests=yes
5512+
fi
5513+
5514+
if test "x$enable_tests" = "xyes"; then
5515+
ENABLE_TESTS_TRUE=
5516+
ENABLE_TESTS_FALSE='#'
5517+
else
5518+
ENABLE_TESTS_TRUE='#'
5519+
ENABLE_TESTS_FALSE=
5520+
fi
5521+
5522+
55015523

55025524
# Check whether --enable-unit-tests was given.
55035525
if test ${enable_unit_tests+y}
@@ -25071,6 +25093,10 @@ if test -z "${BUILD_WITH_WCHAR_T_SUPPORT_TRUE}" && test -z "${BUILD_WITH_WCHAR_T
2507125093
as_fn_error $? "conditional \"BUILD_WITH_WCHAR_T_SUPPORT\" was never defined.
2507225094
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2507325095
fi
25096+
if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
25097+
as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
25098+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
25099+
fi
2507425100
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
2507525101
as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
2507625102
Usually this means the macro was only invoked conditionally." "$LINENO" 5

‎configure.ac

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,13 @@ AM_CONDITIONAL([BUILD_WITH_WCHAR_T_SUPPORT],
143143
AS_VAR_SET([BUILD_WITH_WCHAR_T_SUPPORT], [$with_wchar_t_support])
144144
AC_SUBST([BUILD_WITH_WCHAR_T_SUPPORT])
145145

146+
dnl Enable tests
147+
LOG4CPLUS_ARG_ENABLE([tests],
148+
[Enable tests [default=yes]],
149+
[enable_tests=yes])
150+
AM_CONDITIONAL([ENABLE_TESTS],
151+
[test "x$enable_tests" = "xyes"])
152+
146153
dnl Enable unit tests
147154

148155
LOG4CPLUS_ARG_ENABLE([unit-tests],

0 commit comments

Comments
 (0)
0