Moved error.[hc] to check_error.[hc], and fixed bug in running checked setup in nofor...

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@120 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/check/debian/changelog b/check/debian/changelog
index 6918388b3bbf52b90df2880f404f7b1cb919f184..2e4b0fc51dd3d9057a39089d4587b6244f9afe3d 100644 (file)
--- a/check/debian/changelog
+++ b/check/debian/changelog
@@ -1,3 +1,9 @@
+check (0.8.1-1) unstable; urgency=low
+
+  * See upstream changelog
+
+ -- Arien Malec <arien_malec@yahoo.com>  Wed, 27 Feb 2002 18:25:00 +0000
+
 check (0.8.0-1) unstable; urgency=low
 
   * See upstream changelog

diff --git a/check/debian/files b/check/debian/files
index f5a28465b68ac238e05e2139a0d0bb4bf58c0c4c..c101529c59f7c05fdf5b6a161b9bf8b08184d8f7 100644 (file)
--- a/check/debian/files
+++ b/check/debian/files
@@ -1 +1 @@
-check_0.8.0-1_i386.deb devel optional
+check_0.8.1-1_i386.deb devel optional

diff --git a/check/rpm/check.spec b/check/rpm/check.spec
index 35a85eac0b075ae3b666258155fe078dd2277f1c..085d87a8b9363151cc63af2b5fda55cb06d82303 100644 (file)
--- a/check/rpm/check.spec
+++ b/check/rpm/check.spec
@@ -1,9 +1,9 @@
 Summary: A unit test framework for C
 Name: check
-Version: 0.8.0
+Version: 0.8.1
 Release: 1
 Epoch: 1
-Source: http://prdownloads.sourceforge.net/check/check-0.8.0.tar.gz
+Source: http://prdownloads.sourceforge.net/check/check-0.8.1.tar.gz
 Group: Development/Tools
 Copyright: GPL
 URL: http://check.sourceforge.net

diff --git a/check/src/Makefile.am b/check/src/Makefile.am
index dc2c003834e9a4726c4cf318e04d007a46c082fc..7181e5ec227c8a09c396f0b000ad518b6104f18a 100644 (file)
--- a/check/src/Makefile.am
+++ b/check/src/Makefile.am
@@ -9,7 +9,7 @@ libcheck_a_SOURCES=\
        check_log.h check_log.c\
        check_str.h check_str.c\
        check_print.h check_print.c\
-       error.h error.c\
+       check_error.h check_error.c\
        list.h list.c
 
 

diff --git a/check/src/Makefile.in b/check/src/Makefile.in
index eb90d0dda7af444f296ad15993523eb401fab161..7483419b419723ab9725696a5c26dd272328b48e 100644 (file)
--- a/check/src/Makefile.in
+++ b/check/src/Makefile.in
@@ -70,7 +70,7 @@ lib_LIBRARIES = libcheck.a
 
 include_HEADERS = check.h
 
-libcheck_a_SOURCES =   check.h check_impl.h check_magic.h check.c check_run.c  check_pack.h check_pack.c       check_msg.h check_msg.c         check_log.h check_log.c         check_str.h check_str.c         check_print.h check_print.c     error.h error.c         list.h list.c
+libcheck_a_SOURCES =   check.h check_impl.h check_magic.h check.c check_run.c  check_pack.h check_pack.c       check_msg.h check_msg.c         check_log.h check_log.c         check_str.h check_str.c         check_print.h check_print.c     check_error.h check_error.c     list.h list.c
 
 
 CLEANFILES = *.*~
@@ -86,7 +86,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libcheck_a_LIBADD = 
 libcheck_a_OBJECTS =  check.o check_run.o check_pack.o check_msg.o \
-check_log.o check_str.o check_print.o error.o list.o
+check_log.o check_str.o check_print.o check_error.o list.o
 AR = ar
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -101,9 +101,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/check.P .deps/check_log.P .deps/check_msg.P \
-.deps/check_pack.P .deps/check_print.P .deps/check_run.P \
-.deps/check_str.P .deps/error.P .deps/list.P
+DEP_FILES =  .deps/check.P .deps/check_error.P .deps/check_log.P \
+.deps/check_msg.P .deps/check_pack.P .deps/check_print.P \
+.deps/check_run.P .deps/check_str.P .deps/list.P
 SOURCES = $(libcheck_a_SOURCES)
 OBJECTS = $(libcheck_a_OBJECTS)
 

diff --git a/check/src/check.c b/check/src/check.c
index 9e71550d25f911108a4c05ebda8a8b8747b3daab..1d91d959e4778c2d81f24ba6737d0bdd26fb4ad2 100644 (file)
--- a/check/src/check.c
+++ b/check/src/check.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "error.h"
+#include "check_error.h"
 #include "list.h"
 #include "check.h"
 #include "check_impl.h"

diff --git a/check/src/error.c b/check/src/check_error.c
similarity index 98%
rename from check/src/error.c
rename to check/src/check_error.c
index 9f300e0f70c267cb4df851b7e0770e6e1333b9bf..3cf8c26e3ff2d084a88aa82b793acf7b59da52f5 100644 (file)
--- a/check/src/error.c
+++ b/check/src/check_error.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "error.h"
+#include "check_error.h"
 
 
 void eprintf (char *fmt, char *file, int line, ...)

diff --git a/check/src/error.h b/check/src/check_error.h
similarity index 100%
rename from check/src/error.h
rename to check/src/check_error.h

diff --git a/check/src/check_log.c b/check/src/check_log.c
index 78ef2d36d2c1524b5cf62b505c4181ccb42a11e3..f01d1f7d2200439d8b63f4cb32443be7e55976dd 100644 (file)
--- a/check/src/check_log.c
+++ b/check/src/check_log.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <check.h>
 #include "list.h"
-#include "error.h"
+#include "check_error.h"
 #include "check_impl.h"
 #include "check_log.h"
 #include "check_print.h"

diff --git a/check/src/check_msg.c b/check/src/check_msg.c
index 52cf8bc641d0228cf0347dd443655d6a94e0773f..b1e9d3789ed95366c1012382992253f5511c335c 100644 (file)
--- a/check/src/check_msg.c
+++ b/check/src/check_msg.c
@@ -23,7 +23,7 @@
 #include "stdlib.h"
 #include "stdio.h"
 #include "list.h"
-#include "error.h"
+#include "check_error.h"
 #include "check.h"
 #include "check_impl.h"
 #include "check_msg.h"

diff --git a/check/src/check_pack.c b/check/src/check_pack.c
index 4bd196c9f3803c4aab640209b03f86cca4d0d0f4..7fff8c5dd76184cfaa6df7cfb0a91b83019b2119 100644 (file)
--- a/check/src/check_pack.c
+++ b/check/src/check_pack.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "list.h"
-#include "error.h"
+#include "check_error.h"
 #include "check.h"
 #include "check_magic.h"
 #include "check_impl.h"

diff --git a/check/src/check_run.c b/check/src/check_run.c
index 7e2606c30e87e5862eaba8fe593f82399cc66050..25acb8e2440fedbb4bf19171d3b03ed478e212ad 100644 (file)
--- a/check/src/check_run.c
+++ b/check/src/check_run.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
-#include "error.h"
+#include "check_error.h"
 #include "list.h"
 #include "check.h"
 #include "check_impl.h"
@@ -307,7 +307,9 @@ static void set_nofork_info (TestResult *tr)
 
 static TestResult *tcase_run_tfun_nofork (TCase *tc, TF *tfun)
 {
+  tcase_run_checked_setup(tc);
   tfun->fn();
+  tcase_run_checked_teardown(tc);
   return receive_result_info_nofork (tc->name);
 }
 

diff --git a/check/src/check_str.c b/check/src/check_str.c
index 9df4871650e1964ca12bb2a088b731800be5932d..c7803be8fe8fbac31b215bb13722c86b4eb0b953 100644 (file)
--- a/check/src/check_str.c
+++ b/check/src/check_str.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <check.h>
 #include "list.h"
-#include "error.h"
+#include "check_error.h"
 #include "check_impl.h"
 #include "check_str.h"
 

diff --git a/check/src/list.c b/check/src/list.c
index 4f1ebef1373a857b7ca819c68d3b4e1f6c9037d3..cd6c6f3f18847eb1a77558f1c1984d7cff56cd14 100644 (file)
--- a/check/src/list.c
+++ b/check/src/list.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include "list.h"
-#include "error.h"
+#include "check_error.h"
 
 enum {
   LINIT = 1,

diff --git a/check/tests/check_check_fixture.c b/check/tests/check_check_fixture.c
index d460974bfc2cff54f9b99f69ed3dfd49b5f73fa3..6e696b167abeb06f066e8a1a44b9440f4b758c54 100644 (file)
--- a/check/tests/check_check_fixture.c
+++ b/check/tests/check_check_fixture.c
@@ -2,7 +2,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <check.h>
-#include "error.h"
+#include "check_error.h"
 #include "check_str.h"
 #include "check_check.h"
 #include "check_magic.h"

diff --git a/check/tests/check_check_pack.c b/check/tests/check_check_pack.c
index baa3f457ac2ef9309808e62474ba298b933ba4c6..e36d05ed39b050d6486304494c6dd43b6122b530 100644 (file)
--- a/check/tests/check_check_pack.c
+++ b/check/tests/check_check_pack.c
@@ -6,7 +6,7 @@
 #include <check.h>
 #include "check_magic.h"
 #include "check_pack.h"
-#include "error.h"
+#include "check_error.h"
 #include "check_check.h"
 
 START_TEST(test_pack_fmsg)