Module Name: src
Committed By: jruoho
Date: Tue Mar 13 05:40:00 UTC 2012
Modified Files:
src/tests/usr.bin/diff: t_diff.sh
src/tests/usr.bin/pr: t_basic.sh
Log Message:
PRs bin/41880 and bin/26453 were fixed, so remove xfails.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/diff/t_diff.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/pr/t_basic.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/diff/t_diff.sh
diff -u src/tests/usr.bin/diff/t_diff.sh:1.2 src/tests/usr.bin/diff/t_diff.sh:1.3
--- src/tests/usr.bin/diff/t_diff.sh:1.2 Wed May 11 22:08:12 2011
+++ src/tests/usr.bin/diff/t_diff.sh Tue Mar 13 05:40:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_diff.sh,v 1.2 2011/05/11 22:08:12 njoly Exp $
+# $NetBSD: t_diff.sh,v 1.3 2012/03/13 05:40:00 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,13 +30,11 @@
atf_test_case mallocv
mallocv_head() {
- atf_set "descr" "Test diff(1) with MALLOC_OPTIONS=V"
+ atf_set "descr" "Test diff(1) with MALLOC_OPTIONS=V (cf. PR bin/26453)"
}
mallocv_body() {
- atf_expect_fail "PR bin/26453"
-
atf_check -s ignore \
-e not-inline:"diff: memory exhausted\n" \
-x "env MALLOC_OPTIONS=V diff " \
Index: src/tests/usr.bin/pr/t_basic.sh
diff -u src/tests/usr.bin/pr/t_basic.sh:1.3 src/tests/usr.bin/pr/t_basic.sh:1.4
--- src/tests/usr.bin/pr/t_basic.sh:1.3 Wed May 11 22:08:12 2011
+++ src/tests/usr.bin/pr/t_basic.sh Tue Mar 13 05:40:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_basic.sh,v 1.3 2011/05/11 22:08:12 njoly Exp $
+# $NetBSD: t_basic.sh,v 1.4 2012/03/13 05:40:00 jruoho Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,13 +30,11 @@
atf_test_case basic
basic_head() {
- atf_set "descr" "A basic test of pr(1)"
+ atf_set "descr" "A basic test of pr(1) (cf. PR bin/41880)"
}
basic_body() {
- atf_expect_fail "PR bin/41880"
-
# The output file was generated with "pr (GNU coreutils) 6.10".
#
atf_check -s ignore -o file:$(atf_get_srcdir)/d_basic.out \
