diff options
author | obache <obache> | 2010-08-18 04:36:13 +0000 |
---|---|---|
committer | obache <obache> | 2010-08-18 04:36:13 +0000 |
commit | ee96c4aecdc825014eb797a3162f4be7d9c64d6e (patch) | |
tree | f63faca724deec09ad0d1688d788953da19d3722 /devel/check | |
parent | d426dbea45d16e41336326792c2e51c3a2b1166d (diff) | |
download | pkgsrc-ee96c4aecdc825014eb797a3162f4be7d9c64d6e.tar.gz |
Update check to 0.9.8.
Based on PR#43757 by Kamel Derouiche.
Tue, Sep 22, 2009: Released Check 0.9.8
based on r559 (2009-09-23 21:00).
* Fix CHECK_MICRO_VERSION, left at 6 in 0.9.7 by mistake.
Tue, Sep 22, 2009: Released Check 0.9.7
based on r552 (2009-09-22 09:26).
* Added CK_SUBUNIT support for outputting test information in the subunit wire
protocol. See the check manual for more information. (Contributed by Robert
Collins).
* Added code and tests for timeout scaling via environment variable.
Feature requested in tracker item #1549835 on sourceforge.
* Added documentation for testing exit values with tcase_add_exit_test().
* Add make_macros perl script from somebody (who?)
* add type to check_type error message
* add contrib dir with xslt transform
* function exist testing support (patch #1726574).
* introduce HAVE_WORKING_SETENV to protect tc_timeout_env usage
* support running tests with multiple pthreads (Daniel Gollub, closes 1391527)
* partial MSYS/MinGW support
Mon, Dec 29, 2008: Released Check 0.9.6
based on r453 (2008-12-01 22:14:15).
* 'make distcheck' does not work out of the box. Disable the two
top lines in doc/Makefile.am and it shall pass. Will have to
be fixed later.
* add call to AC_REPLACE_FUNCS([strsignal])
* add new rpl_strsignal following rpl_(re)malloc template, body
of function due to Roland Illig
-- hopefully closes 1629755
* add missing NULL argument to fail* varargs macro calls
* define incorrect tests for __GNUC__ only
-- both per Roland Illig in bug 1677391
* define CK_ATTRIBUTE_UNUSED for GCC >= 2.95, closing:
[ 1674626 ] compile error with non defined __attribute__ compiler
* Fixed error in documentation example Makefile.am, bug #1888237
* Fixed spelling (patch #1652630)
* Handle NULL in srunner_add_suite(). Fixes #1624887
* add CK_FORK_GETENV to enum fork_status and delete CK_FORK_UNSPECIFIED
* call strdup on result from strsignal to avoid clobbering it
* add Torok Edwin to AUTHORS
* add CK_TEST_RESULT_INVALID to enum test_result
* add CK_CTX_INVALID to ck_result_ctx and don't use -1 anymore
* count checks in setup() as well; patch due to Roland Stigge
* use int __attribute__((unused)) _i instead of
int _i __attribute__((unused))
per gcc-3.3.5 request from Sebastian Trahm
* rename signal to _signal in _tcase_add_test to avoid a
symbol clash with /usr/include/sys/signal.h on OS X.
* define rpl_malloc and rpl_realloc for platforms where
!malloc(0) and !realloc(0,0), such as AIX, because configure
goes and redefines malloc/realloc in this case...
* SVNChangeLog patch from Robert Collins
* Incorporated patch from Debian for debian bug #395466. This fixes
'AM_PATH_CHECK causes "possibly undefined macro" errors'.
* Added new Check fail API. Implemented on top of fail_unless. Future
versions will reverse this so fail_unless is implemented on top of the
ck_assert API. This API is not documented yet, will probably not be fully
released until 0.9.8, when it will be possible to choose API.
Diffstat (limited to 'devel/check')
-rw-r--r-- | devel/check/Makefile | 9 | ||||
-rw-r--r-- | devel/check/distinfo | 12 | ||||
-rw-r--r-- | devel/check/patches/patch-ab | 97 | ||||
-rw-r--r-- | devel/check/patches/patch-ac | 26 | ||||
-rw-r--r-- | devel/check/patches/patch-ad | 24 | ||||
-rw-r--r-- | devel/check/patches/patch-ae | 71 |
6 files changed, 9 insertions, 230 deletions
diff --git a/devel/check/Makefile b/devel/check/Makefile index 5064bc3d82c..642ebefc76b 100644 --- a/devel/check/Makefile +++ b/devel/check/Makefile @@ -1,21 +1,22 @@ -# $NetBSD: Makefile,v 1.15 2008/04/16 13:03:43 obache Exp $ +# $NetBSD: Makefile,v 1.16 2010/08/18 04:36:13 obache Exp $ # -DISTNAME= check-0.9.5 +DISTNAME= check-0.9.8 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=check/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://check.sourceforge.net/ COMMENT= Unit test framework for C +LICENSE= gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--enable-plain-docdir -USE_TOOLS+= gmake USE_LIBTOOL= yes INFO_FILES= yes + PKGCONFIG_OVERRIDE= check.pc.in +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/check/distinfo b/devel/check/distinfo index a38a53735e1..25b9131da40 100644 --- a/devel/check/distinfo +++ b/devel/check/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.11 2007/03/09 16:25:56 rillig Exp $ +$NetBSD: distinfo,v 1.12 2010/08/18 04:36:13 obache Exp $ -SHA1 (check-0.9.5.tar.gz) = 84b9d1ace6d0bf0fc73c9de2e684a62f73d312f8 -RMD160 (check-0.9.5.tar.gz) = 1975578245444ffdc8cec43e53dedc3aac8553ea -Size (check-0.9.5.tar.gz) = 520625 bytes -SHA1 (patch-ab) = c42c564aea74984b8da2899819b0e250dbf610ec -SHA1 (patch-ac) = a10664d2af2c3cd4b01388846e9193206c4d93cb -SHA1 (patch-ad) = 1d15dd42e45b4201ab9efa24b70246c8451e4ab7 -SHA1 (patch-ae) = a4159f4c1a8150f7951afc07588f3e83f90e82b8 +SHA1 (check-0.9.8.tar.gz) = a75cc89411e24b5d39b7869f8233e19f210de555 +RMD160 (check-0.9.8.tar.gz) = 75e0d1981109086ac597e57655ba9561f1b79211 +Size (check-0.9.8.tar.gz) = 558943 bytes diff --git a/devel/check/patches/patch-ab b/devel/check/patches/patch-ab deleted file mode 100644 index c595f1256c2..00000000000 --- a/devel/check/patches/patch-ab +++ /dev/null @@ -1,97 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2007/03/09 16:25:56 rillig Exp $ - -Too few arguments to varargs macro. - ---- tests/check_check_sub.c.orig Tue Nov 21 18:19:15 2006 -+++ tests/check_check_sub.c Fri Mar 9 11:06:47 2007 -@@ -58,12 +58,13 @@ - } - END_TEST - -- -+#if defined(__GNUC__) - START_TEST(test_fail_no_msg) - { - fail_unless(4 == 5); - } - END_TEST -+#endif - - START_TEST(test_fail_if_null_msg) - { -@@ -71,12 +72,13 @@ - } - END_TEST - -- -+#if defined(__GNUC__) - START_TEST(test_fail_if_no_msg) - { - fail_if(4 != 5); - } - END_TEST -+#endif - - START_TEST(test_fail_vararg_msg_1) - { -@@ -102,11 +104,13 @@ - } - END_TEST - -+#if defined(__GNUC__) - START_TEST(test_fail_empty) - { - fail(); - } - END_TEST -+#endif - - START_TEST(test_segv) /* line 111 */ - { -@@ -201,7 +205,7 @@ - if((pid = fork()) < 0) { - fail("Failed to fork new process"); - } else if (pid > 0) { -- fail_unless(1); -+ fail_unless(1, NULL); - kill(pid, SIGKILL); - } else { - for (;;) { -@@ -237,7 +241,7 @@ - } else if (pid > 0) { - check_waitpid_and_exit(pid); - } else { -- fail_unless(1); -+ fail_unless(1, NULL); - check_waitpid_and_exit(0); - } - } -@@ -268,7 +272,7 @@ - if((pid2 = check_fork()) < 0) { - fail("Failed to fork new process"); - } else if (pid2 == 0) { -- fail_unless(1); -+ fail_unless(1, NULL); - check_waitpid_and_exit(0); - } - check_waitpid_and_exit(pid2); -@@ -361,13 +365,19 @@ - tcase_add_test (tc_simple, test_fail_if_pass); - tcase_add_test (tc_simple, test_fail_if_fail); - tcase_add_test (tc_simple, test_fail_null_msg); -+#if defined(__GNUC__) - tcase_add_test (tc_simple, test_fail_no_msg); -+#endif - tcase_add_test (tc_simple, test_fail_if_null_msg); -+#if defined(__GNUC__) - tcase_add_test (tc_simple, test_fail_if_no_msg); -+#endif - tcase_add_test (tc_simple, test_fail_vararg_msg_1); - tcase_add_test (tc_simple, test_fail_vararg_msg_2); - tcase_add_test (tc_simple, test_fail_vararg_msg_3); -+#if defined(__GNUC__) - tcase_add_test (tc_simple, test_fail_empty); -+#endif - - tcase_add_test (tc_signal, test_segv); - tcase_add_test_raise_signal (tc_signal, test_segv, 11); /* pass */ diff --git a/devel/check/patches/patch-ac b/devel/check/patches/patch-ac deleted file mode 100644 index f3f123cf179..00000000000 --- a/devel/check/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2007/03/09 16:25:56 rillig Exp $ - -Too few arguments to varargs macro. - -Not every compiler knows __attribute__. - ---- src/check.h.in.orig Fri Mar 9 10:56:14 2007 -+++ src/check.h.in Fri Mar 9 10:55:11 2007 -@@ -173,10 +173,17 @@ - /* Start a unit test with START_TEST(unit_name), end with END_TEST - One must use braces within a START_/END_ pair to declare new variables - */ -+#if defined(__GNUC__) - #define START_TEST(__testname)\ - static void __testname (int _i __attribute__((unused)))\ - {\ - tcase_fn_start (""# __testname, __FILE__, __LINE__); -+#else -+#define START_TEST(__testname)\ -+static void __testname (int _i)\ -+{\ -+ tcase_fn_start (""# __testname, __FILE__, __LINE__); -+#endif - - /* End a unit test */ - #define END_TEST } diff --git a/devel/check/patches/patch-ad b/devel/check/patches/patch-ad deleted file mode 100644 index 931086f7e61..00000000000 --- a/devel/check/patches/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2007/03/09 16:25:57 rillig Exp $ - -IRIX and HP/UX don't have strsignal. - ---- src/check_run.c.orig Tue Nov 21 18:19:13 2006 -+++ src/check_run.c Fri Mar 9 10:51:17 2007 -@@ -85,6 +85,17 @@ - static int alarm_received; - static pid_t group_pid; - -+#if defined(__sgi) -+static const char * -+strsignal(int sig) -+{ -+ static char signame[40]; -+ -+ sprintf(signame, "SIG#%d", sig); -+ return signame; -+} -+#endif -+ - static void sig_handler(int sig_nr) - { - switch (sig_nr) { diff --git a/devel/check/patches/patch-ae b/devel/check/patches/patch-ae deleted file mode 100644 index b8234315617..00000000000 --- a/devel/check/patches/patch-ae +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2007/03/09 16:25:57 rillig Exp $ - -IRIX and HP/UX don't have strsignal. - -Too few arguments to varargs macro. - ---- tests/check_check_master.c.orig Fri Mar 9 11:11:41 2007 -+++ tests/check_check_master.c Fri Mar 9 11:11:49 2007 -@@ -86,6 +86,17 @@ - - static int nr_of_master_tests = sizeof master_tests /sizeof master_tests[0]; - -+#if defined(__sgi) -+static const char * -+strsignal(int sig) -+{ -+ static char signame[40]; -+ -+ sprintf(signame, "SIG#%d", sig); -+ return signame; -+} -+#endif -+ - START_TEST(test_check_nfailures) - { - int i; -@@ -123,9 +134,9 @@ - continue; - } - -- fail_if(i - passed > sub_nfailed); -+ fail_if(i - passed > sub_nfailed, NULL); - tr = tr_fail_array[i - passed]; -- fail_unless(tr != NULL); -+ fail_unless(tr != NULL, NULL); - got_msg = tr_msg(tr); - expected_msg = master_tests[i].msg; - if (strcmp(got_msg, expected_msg) != 0) { -@@ -152,9 +163,9 @@ - continue; - } - -- fail_if(i - passed > sub_nfailed); -+ fail_if(i - passed > sub_nfailed, NULL); - tr = tr_fail_array[i - passed]; -- fail_unless(tr != NULL); -+ fail_unless(tr != NULL, NULL); - line_no = master_tests[i].line_nos; - if (line_no > 0 && tr_lno(tr) != line_no) { - char *emsg = malloc(MAXSTR); -@@ -179,9 +190,9 @@ - continue; - } - -- fail_if(i - passed > sub_nfailed); -+ fail_if(i - passed > sub_nfailed, NULL); - tr = tr_fail_array[i - passed]; -- fail_unless(tr != NULL); -+ fail_unless(tr != NULL, NULL); - fail_unless(master_tests[i].failure_type == tr_rtype(tr), - "Failure type wrong for test %d", i); - } -@@ -193,7 +204,7 @@ - int i; - for (i = 0; i < sub_nfailed; i++) { - TestResult *tr = tr_fail_array[i]; -- fail_unless(tr != NULL); -+ fail_unless(tr != NULL, NULL); - fail_unless(tr_lfile(tr) != NULL, "Bad file name for test %d", i); - fail_unless(strstr(tr_lfile(tr), "check_check_sub.c") != 0, - "Bad file name for test %d", i); |