From: rbcollins <rbcollins@64e312b2-a51f-0410-8e61-82d0ca0eb02a>
Date: Tue, 22 Sep 2009 00:07:21 +0000 (+0000)
Subject: Merge back release 0.9.7
X-Git-Tag: 0.10.0~610
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c699dd698485dff73b5813345d1afe77b64d0229;p=check

Merge back release 0.9.7

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

diff --git a/Makefile.am b/Makefile.am
index 4429726..cfcb443 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,8 +81,8 @@ preparerelease: releasevars .svnrelease prereleasecheck
 	@echo "aborting will leave the partially prepared release in" `pwd`
 	cd check-${RELEASE_VERSION} && ${SHELL} && autoreconf -i && ./configure
 	$(MAKE) -C check-${RELEASE_VERSION} dorelease
-	-svn merge -r`cat .svnrelease`:`svn st -u check-${RELEASE_VERSION} | grep "Status against revision:" | awk '{ print $4 }'` ../tags/check-${RELEASE_VERSION} .
-	@echo "Please resolve any conflicts"
+	-svn merge -r`cat .svnrelease`:`svn st -u check-${RELEASE_VERSION} | grep "Status against revision:" | awk '{ print $4 }'` check-${RELEASE_VERSION} .
+	@echo "Please resolve any conflicts. Be sure to also restore the 'In Development:' line to NEWS."
 	${SHELL}
 	svn ci -m "Merge back release ${RELEASE_VERSION}"
 	@echo "Cleaning up workdir."
diff --git a/NEWS b/NEWS
index d13a6a0..bf1e89f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,31 @@
 In development:
 
+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).
 
diff --git a/configure.ac b/configure.ac
index b950bee..01b1cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 # Prelude.
 AC_PREREQ([2.59])
-AC_INIT([Check], [0.9.6], [check-devel at lists dot sourceforge dot net])
+AC_INIT([Check], [0.9.7], [check-devel at lists dot sourceforge dot net])
 
 # unique source file --- primitive safety check 
 AC_CONFIG_SRCDIR([src/check.c])