ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3145. [test] Capture output of ATF unit tests in "./atf.out" if

Browse Source 
there were any errors while running them. [RT #25527]
This commit is contained in:
Evan Hunt
2011-08-23 01:29:39 +00:00
parent 2a83053102
commit 99cbc3d3a4
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3145. [test] Capture output of ATF unit tests in "./atf.out" if
there were any errors while running them. [RT #25527]
3144. [bug] dns_dbiterator_seek() could trigger an assert when
used with a nonexistent database node. [RT #25358]

1
lib/dns/tests/.cvsignore
View File

@@ -1,2 +1,3 @@
Makefile
atf.out
*_test

3
lib/dns/tests/Makefile.in
View File

@@ -12,7 +12,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.6 2011/08/23 00:59:23 each Exp $
# $Id: Makefile.in,v 1.7 2011/08/23 01:29:38 each Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -76,3 +76,4 @@ unit::
clean distclean::
rm -f ${TARGETS}
rm -f atf.out

4
lib/dns/tests/update_test.c
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: update_test.c,v 1.4 2011/07/06 18:11:35 each Exp $ */
/* $Id: update_test.c,v 1.5 2011/08/23 01:29:38 each Exp $ */
/* $Id: */
@@ -69,7 +69,7 @@ ATF_TC_BODY(increment, tc) {
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
new = dns_update_soaserial(old, dns_updatemethod_increment);
ATF_REQUIRE_EQ(isc_serial_lt(old, new), ISC_TRUE);
ATF_CHECK(new != 0);
ATF_CHECK_MSG(new != 0, "new (%d) should not equal 0", new);
ATF_REQUIRE_EQ(new, 51);
dns_test_end();
}

1
lib/isc/tests/.cvsignore
View File

@@ -1,2 +1,3 @@
Makefile
atf.out
*_test

3
lib/isc/tests/Makefile.in
View File

@@ -12,7 +12,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.5 2011/08/23 00:59:23 each Exp $
# $Id: Makefile.in,v 1.6 2011/08/23 01:29:38 each Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -59,3 +59,4 @@ unit::
clean distclean::
rm -f ${TARGETS}
rm -f atf.out

6
unit/unittest.sh.in
View File

@@ -5,6 +5,8 @@ export PATH
if [ -n "@ATFBIN@" ]
then
# | cat is there to force non-fancy output
atf-run | atf-report | cat
atf-run > atf.out
status=$?
atf-report < atf.out
[ $status -eq 0 ] && rm -f atf.out
fi