Skip to content

Commit d47022d

Browse files
wilxwilx
committed
propertyconfig_test: Split log4cplus.properties.in to log4cplus.properties.in
and log4cplus.tail.properties.in to test 'include' functionality.
1 parent 274dc97 commit d47022d

File tree

7 files changed

+39
-17
lines changed

7 files changed

+39
-17
lines changed

‎Makefile.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ DIST_COMMON = $(srcdir)/src/Makefile.am \
128128
$(top_srcdir)/tests/filter_test/log4cplus.properties.in \
129129
$(top_srcdir)/tests/performance_test/log4cplus.properties.in \
130130
$(top_srcdir)/tests/propertyconfig_test/log4cplus.properties.in \
131+
$(top_srcdir)/tests/propertyconfig_test/log4cplus.tail.properties.in \
131132
$(srcdir)/log4cplus.pc.in depcomp $(am__pkgpython_PYTHON_DIST) \
132133
py-compile
133134
noinst_PROGRAMS = appender_test$(EXEEXT) $(am__EXEEXT_1) \
@@ -177,7 +178,9 @@ CONFIG_CLEAN_FILES = tests/atlocal \
177178
tests/configandwatch_test/log4cplus.properties \
178179
tests/filter_test/log4cplus.properties \
179180
tests/performance_test/log4cplus.properties \
180-
tests/propertyconfig_test/log4cplus.properties log4cplus.pc
181+
tests/propertyconfig_test/log4cplus.properties \
182+
tests/propertyconfig_test/log4cplus.tail.properties \
183+
log4cplus.pc
181184
CONFIG_CLEAN_VPATH_FILES =
182185
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
183186
am__vpath_adj = case $$p in \
@@ -983,6 +986,8 @@ tests/performance_test/log4cplus.properties: $(top_builddir)/config.status $(top
983986
cd $(top_builddir) && $(SHELL) ./config.status $@
984987
tests/propertyconfig_test/log4cplus.properties: $(top_builddir)/config.status $(top_srcdir)/tests/propertyconfig_test/log4cplus.properties.in
985988
cd $(top_builddir) && $(SHELL) ./config.status $@
989+
tests/propertyconfig_test/log4cplus.tail.properties: $(top_builddir)/config.status $(top_srcdir)/tests/propertyconfig_test/log4cplus.tail.properties.in
990+
cd $(top_builddir) && $(SHELL) ./config.status $@
986991
log4cplus.pc: $(top_builddir)/config.status $(srcdir)/log4cplus.pc.in
987992
cd $(top_builddir) && $(SHELL) ./config.status $@
988993

‎configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22946,7 +22946,7 @@ ac_config_headers="$ac_config_headers include/log4cplus/config/defines.hxx"
2294622946
ac_config_files="$ac_config_files Makefile include/Makefile tests/atlocal"
2294722947

2294822948

22949-
ac_config_files="$ac_config_files tests/configandwatch_test/log4cplus.properties tests/filter_test/log4cplus.properties tests/performance_test/log4cplus.properties tests/propertyconfig_test/log4cplus.properties"
22949+
ac_config_files="$ac_config_files tests/configandwatch_test/log4cplus.properties tests/filter_test/log4cplus.properties tests/performance_test/log4cplus.properties tests/propertyconfig_test/log4cplus.properties tests/propertyconfig_test/log4cplus.tail.properties"
2295022950

2295122951

2295222952

@@ -24106,6 +24106,7 @@ do
2410624106
"tests/filter_test/log4cplus.properties") CONFIG_FILES="$CONFIG_FILES tests/filter_test/log4cplus.properties" ;;
2410724107
"tests/performance_test/log4cplus.properties") CONFIG_FILES="$CONFIG_FILES tests/performance_test/log4cplus.properties" ;;
2410824108
"tests/propertyconfig_test/log4cplus.properties") CONFIG_FILES="$CONFIG_FILES tests/propertyconfig_test/log4cplus.properties" ;;
24109+
"tests/propertyconfig_test/log4cplus.tail.properties") CONFIG_FILES="$CONFIG_FILES tests/propertyconfig_test/log4cplus.tail.properties" ;;
2410924110
"log4cplus.pc") CONFIG_FILES="$CONFIG_FILES log4cplus.pc" ;;
2411024111

2411124112
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

‎tests/configure.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ AC_CONFIG_FILES([
22
tests/configandwatch_test/log4cplus.properties
33
tests/filter_test/log4cplus.properties
44
tests/performance_test/log4cplus.properties
5-
tests/propertyconfig_test/log4cplus.properties])
5+
tests/propertyconfig_test/log4cplus.properties
6+
tests/propertyconfig_test/log4cplus.tail.properties])

‎tests/propertyconfig_test.at

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ AT_SETUP([propertyconfig_test])
22
AT_KEYWORDS([appenders])
33

44
AT_CHECK([cp -f "${abs_builddir}/propertyconfig_test/log4cplus.properties" .])
5+
AT_CHECK([cp -f "${abs_builddir}/propertyconfig_test/log4cplus.tail.properties" .])
56
AT_CHECK([ENV_VAR=test "${abs_top_builddir}/propertyconfig_test"], [0], [stdout], [stderr])
67
AT_CHECK([! $GREP "Please initialize the log4cplus system properly"< stderr])
78
AT_CHECK([test -f "output_test.log"])

‎tests/propertyconfig_test/log4cplus.properties.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,4 @@ log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
88
log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
99
log4cplus.appender.STDOUT.layout.ConversionPattern=%d{%m/%d/%y %H:%M:%S} [%t] %-5p %c{2} %%%x%% - %m [%l]%n
1010

11-
log4cplus.appender.R=log4cplus::RollingFileAppender
12-
log4cplus.appender.R.File=output_${ENV_VAR}.log
13-
#log4cplus.appender.R.MaxFileSize=5MB
14-
log4cplus.appender.R.MaxFileSize=500KB
15-
log4cplus.appender.R.MaxBackupIndex=5
16-
log4cplus.appender.R.layout=log4cplus::TTCCLayout
11+
include log4cplus.tail.properties

‎tests/propertyconfig_test/log4cplus.tail.properties.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
log4cplus.appender.R=log4cplus::RollingFileAppender
2+
log4cplus.appender.R.File=output_${ENV_VAR}.log
3+
#log4cplus.appender.R.MaxFileSize=5MB
4+
log4cplus.appender.R.MaxFileSize=500KB
5+
log4cplus.appender.R.MaxBackupIndex=5
6+
log4cplus.appender.R.layout=log4cplus::TTCCLayout

‎tests/testsuite

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5309,41 +5309,54 @@ $at_failed && at_fn_log_failure
53095309
$at_traceon; }
53105310

53115311
{ set +x
5312-
$as_echo "$at_srcdir/propertyconfig_test.at:5: ENV_VAR=test \"\${abs_top_builddir}/propertyconfig_test\""
5312+
$as_echo "$at_srcdir/propertyconfig_test.at:5: cp -f \"\${abs_builddir}/propertyconfig_test/log4cplus.tail.properties\" ."
53135313
at_fn_check_prepare_notrace 'a ${...} parameter expansion' "propertyconfig_test.at:5"
5314+
( $at_check_trace; cp -f "${abs_builddir}/propertyconfig_test/log4cplus.tail.properties" .
5315+
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
5316+
at_status=$? at_failed=false
5317+
$at_check_filter
5318+
at_fn_diff_devnull "$at_stderr" || at_failed=:
5319+
at_fn_diff_devnull "$at_stdout" || at_failed=:
5320+
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:5"
5321+
$at_failed && at_fn_log_failure
5322+
$at_traceon; }
5323+
5324+
{ set +x
5325+
$as_echo "$at_srcdir/propertyconfig_test.at:6: ENV_VAR=test \"\${abs_top_builddir}/propertyconfig_test\""
5326+
at_fn_check_prepare_notrace 'a ${...} parameter expansion' "propertyconfig_test.at:6"
53145327
( $at_check_trace; ENV_VAR=test "${abs_top_builddir}/propertyconfig_test"
53155328
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
53165329
at_status=$? at_failed=false
53175330
$at_check_filter
53185331
echo stderr:; tee stderr <"$at_stderr"
53195332
echo stdout:; tee stdout <"$at_stdout"
5320-
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:5"
5333+
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:6"
53215334
$at_failed && at_fn_log_failure
53225335
$at_traceon; }
53235336

53245337
{ set +x
5325-
$as_echo "$at_srcdir/propertyconfig_test.at:6: ! \$GREP \"Please initialize the log4cplus system properly\"< stderr"
5326-
at_fn_check_prepare_dynamic "! $GREP \"Please initialize the log4cplus system properly\"< stderr" "propertyconfig_test.at:6"
5338+
$as_echo "$at_srcdir/propertyconfig_test.at:7: ! \$GREP \"Please initialize the log4cplus system properly\"< stderr"
5339+
at_fn_check_prepare_dynamic "! $GREP \"Please initialize the log4cplus system properly\"< stderr" "propertyconfig_test.at:7"
53275340
( $at_check_trace; ! $GREP "Please initialize the log4cplus system properly"< stderr
53285341
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
53295342
at_status=$? at_failed=false
53305343
$at_check_filter
53315344
at_fn_diff_devnull "$at_stderr" || at_failed=:
53325345
at_fn_diff_devnull "$at_stdout" || at_failed=:
5333-
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:6"
5346+
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:7"
53345347
$at_failed && at_fn_log_failure
53355348
$at_traceon; }
53365349

53375350
{ set +x
5338-
$as_echo "$at_srcdir/propertyconfig_test.at:7: test -f \"output_test.log\""
5339-
at_fn_check_prepare_trace "propertyconfig_test.at:7"
5351+
$as_echo "$at_srcdir/propertyconfig_test.at:8: test -f \"output_test.log\""
5352+
at_fn_check_prepare_trace "propertyconfig_test.at:8"
53405353
( $at_check_trace; test -f "output_test.log"
53415354
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
53425355
at_status=$? at_failed=false
53435356
$at_check_filter
53445357
at_fn_diff_devnull "$at_stderr" || at_failed=:
53455358
at_fn_diff_devnull "$at_stdout" || at_failed=:
5346-
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:7"
5359+
at_fn_check_status 0 $at_status "$at_srcdir/propertyconfig_test.at:8"
53475360
$at_failed && at_fn_log_failure
53485361
$at_traceon; }
53495362

0 commit comments

Comments
 (0)