Makefile.am: Fix regeneration of testsuite after testsuite.at change.

performance_test.at: New. Plug in performance_test to the testsuite.

filter_test.at: Check that log4cplus' configuration has not failed.

propertyconfig_test.at: Ditto.

configandwatch_test.at: Ditto.

*: Regenerate.

Author: wilx

Makefile.am

@@ -71,7 +71,7 @@ TESTSUITE_AT = \
   tests/testsuite.at
 
 $(TESTSUITE): $(TESTSUITE_AT)
-	$(AUTOTEST) -I $(srcdir) $(srcdir)/tests/testsuite.at -o $@
+	cd "$(abs_top_srcdir)" && $(AUTOTEST) -I tests tests/testsuite.at -o $@
 
 tests/atconfig: $(top_builddir)/config.status
 	cd "$(top_builddir)" && ./config.status tests/$@

Makefile.in

@@ -2388,7 +2388,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
 @WITH_PYTHON_TRUE@	$(top_srcdir)/swig/log4cplus.swg
 
 $(TESTSUITE): $(TESTSUITE_AT)
-	$(AUTOTEST) -I $(srcdir) $(srcdir)/tests/testsuite.at -o $@
+	cd "$(abs_top_srcdir)" && $(AUTOTEST) -I tests tests/testsuite.at -o $@
 
 tests/atconfig: $(top_builddir)/config.status
 	cd "$(top_builddir)" && ./config.status tests/$@

tests/configandwatch_test.at

@@ -2,6 +2,7 @@ AT_SETUP([configandwatch_test])
 AT_KEYWORDS([appenders])
 
 AT_CHECK([cp -f "${abs_builddir}/configandwatch_test/log4cplus.properties" .])
-AT_CHECK(["${abs_top_builddir}/configandwatch_test"], [0], [ignore], [ignore])
+AT_CHECK(["${abs_top_builddir}/configandwatch_test"], [0], [ignore], [stderr])
+AT_CHECK([! $GREP "Please initialize the log4cplus system properly"< stderr])
 
 AT_CLEANUP

tests/filter_test.at

@@ -5,6 +5,7 @@ AT_CHECK([cp -f "${abs_srcdir}/filter_test/expout" .])
 
 AT_CHECK([cp -f "${abs_builddir}/filter_test/log4cplus.properties" .])
 AT_CHECK(["${abs_top_builddir}/filter_test"], [0], [expout], [stderr])
+AT_CHECK([! $GREP "Please initialize the log4cplus system properly"< stderr])
 
 AT_CHECK([test -s debug_info_msgs.log])
 AT_CHECK([! $GREP 'TRACE\|WARN\|ERROR\|FATAL' debug_info_msgs.log])

tests/patternlayout_test.at

@@ -1,6 +1,6 @@
 AT_SETUP([patternlayout_test])
 AT_KEYWORDS([appenders])
 
-AT_CHECK(["${abs_top_builddir}/patternlayout_test"], [0], [ignore], [ignore])
+AT_CHECK(["${abs_top_builddir}/patternlayout_test"], [0], [ignore], [stderr])
 
 AT_CLEANUP

tests/performance_test.at

@@ -0,0 +1,8 @@
+AT_SETUP([performance_test])
+AT_KEYWORDS([appenders])
+
+AT_CHECK([cp -f "${abs_builddir}/performance_test/log4cplus.properties" .])
+AT_CHECK(["${abs_top_builddir}/performance_test"], [0], [stdout], [stderr])
+AT_CHECK([! $GREP "Please initialize the log4cplus system properly"< stderr])
+
+AT_CLEANUP

tests/propertyconfig_test.at

@@ -1,6 +1,8 @@
 AT_SETUP([propertyconfig_test])
 AT_KEYWORDS([appenders])
 
-AT_CHECK(["${abs_top_builddir}/propertyconfig_test"], [0], [ignore], [ignore])
+AT_CHECK([cp -f "${abs_builddir}/propertyconfig_test/log4cplus.properties" .])
+AT_CHECK(["${abs_top_builddir}/propertyconfig_test"], [0], [stdout], [stderr])
+AT_CHECK([! $GREP "Please initialize the log4cplus system properly"< stderr])
 
 AT_CLEANUP