From: amalec Date: Wed, 25 Jul 2001 21:26:51 +0000 (+0000) Subject: Added log tests X-Git-Tag: 0.10.0~1087 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bf592347da0ef061ba692cb8db597ed16562549;p=check Added log tests git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@57 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- diff --git a/check/Makefile.in b/check/Makefile.in index 646fdea..8da967a 100644 --- a/check/Makefile.in +++ b/check/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -84,13 +84,13 @@ CONFIG_CLEAN_FILES = DATA = $(doc_DATA) DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.h.in \ -configure configure.in install-sh missing mkinstalldirs +Makefile.am Makefile.in NEWS aclocal.m4 config.h.in configure \ +configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -101,10 +101,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): configure.in acinclude.m4 +$(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) diff --git a/check/aclocal.m4 b/check/aclocal.m4 index cf8646d..7d5836b 100644 --- a/check/aclocal.m4 +++ b/check/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -10,7 +10,6 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. - # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. diff --git a/check/config.h.in b/check/config.h.in index 4afb9f2..f5fccbd 100644 --- a/check/config.h.in +++ b/check/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define to empty if the keyword does not work. */ #undef const diff --git a/check/configure b/check/configure index 64085fc..bfe6c39 100755 --- a/check/configure +++ b/check/configure @@ -774,7 +774,7 @@ fi -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 diff --git a/check/doc/money/aclocal.m4 b/check/doc/money/aclocal.m4 index f23ba29..af170a3 100644 --- a/check/doc/money/aclocal.m4 +++ b/check/doc/money/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/check/doc/money/config.h.in b/check/doc/money/config.h.in index c403514..f327bf9 100644 --- a/check/doc/money/config.h.in +++ b/check/doc/money/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define if you have the check library (-lcheck). */ #undef HAVE_LIBCHECK diff --git a/check/doc/money/configure b/check/doc/money/configure index 679db67..e00f5e8 100755 --- a/check/doc/money/configure +++ b/check/doc/money/configure @@ -774,7 +774,7 @@ fi -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 diff --git a/check/src/Makefile.in b/check/src/Makefile.in index 122b877..5c4052d 100644 --- a/check/src/Makefile.in +++ b/check/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -100,7 +100,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DEP_FILES = .deps/check.P .deps/check_log.P .deps/check_msg.P \ .deps/check_run.P .deps/error.P .deps/list.P diff --git a/check/tests/Makefile.in b/check/tests/Makefile.in index b51cfc8..a6d861c 100644 --- a/check/tests/Makefile.in +++ b/check/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -128,7 +128,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DEP_FILES = .deps/check_check_log.P .deps/check_check_main.P \ .deps/check_check_master.P .deps/check_check_msg.P \ diff --git a/check/tests/test_log_output.sh b/check/tests/test_log_output.sh new file mode 100755 index 0000000..ac2fee4 --- /dev/null +++ b/check/tests/test_log_output.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +expected="Running suite S1 +ex_log_output.c:7:P:Core: Test passed +ex_log_output.c:13:F:Core: Failure +ex_log_output.c:17:E:Core: (after this point) Early exit with return value 1 +Running suite S2 +ex_log_output.c:21:P:Core: Test passed +Results for all suites run: +25%: Checks: 4, Failures: 1, Errors: 1" + + +test_log_output ( ) { + + ./ex_log_output "${1}" + actual=`cat test_logfile` + if [ x"${expected}" != x"${actual}" ]; then + echo "Problem with ex_log_output ${3}"; + echo "Expected:"; + echo "${expected}"; + echo "Got:"; + echo "${actual}"; + exit 1; + fi + +} + +test_log_output "CRSILENT"; +test_log_output "CRMINIMAL"; +test_log_output "CRNORMAL"; +test_log_output "CRVERBOSE"; +exit 0