From 07c19c27d323b34a24eb136edd1aac7caaf25a2b Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@FreeBSD.org>
Date: Sat, 3 Jun 2017 18:29:18 +0000
Subject: [PATCH] Fix bin/dd/dd2_tests:seek_overflow on UFS and TMPFS

Split the postive and negative parts into separate test cases.  The positive
test case can only run on ZFS, because only ZFS supports files that large.

PR:		219757
Reported by:	ngie
MFC after:	18 days
X-MFC-with:	319339
---
 bin/dd/tests/dd2_test.sh | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/bin/dd/tests/dd2_test.sh b/bin/dd/tests/dd2_test.sh
index 80b9fe224de5..c0b33fc17226 100755
--- a/bin/dd/tests/dd2_test.sh
+++ b/bin/dd/tests/dd2_test.sh
@@ -26,6 +26,27 @@
 # $FreeBSD$
 
 
+atf_test_case max_seek
+max_seek_head()
+{
+	atf_set "descr" "dd(1) can seek by the maximum amount"
+}
+max_seek_body()
+{
+	case `df -T . | tail -n 1 | cut -wf 2` in
+		"ufs")
+			atf_skip "UFS's maximum file size is too small";;
+		"zfs") ;; # ZFS is fine
+		"tmpfs")
+			atf_skip "tmpfs can't create arbitrarily large spare files";;
+		*) atf_skip "Unknown file system";;
+	esac
+
+	touch f.in
+	seek=`echo "2^63 / 4096 - 1" | bc`
+	atf_check -s exit:0 -e ignore dd if=f.in of=f.out bs=4096 seek=$seek
+}
+
 atf_test_case seek_overflow
 seek_overflow_head()
 {
@@ -33,14 +54,7 @@ seek_overflow_head()
 }
 seek_overflow_body()
 {
-	atf_expect_fail "fails with 'dd: truncating f.out: File too large' - bug 219757"
-
 	touch f.in
-	# Positive tests
-	seek=`echo "2^63 / 4096 - 1" | bc`
-	atf_check -s exit:0 -e ignore dd if=f.in of=f.out bs=4096 seek=$seek
-
-	# Negative tests
 	seek=`echo "2^63 / 4096" | bc`
 	atf_check -s not-exit:0 -e match:"seek offsets cannot be larger than" \
 		dd if=f.in of=f.out bs=4096 seek=$seek
@@ -50,5 +64,6 @@ seek_overflow_body()
 
 atf_init_test_cases()
 {
-        atf_add_test_case seek_overflow
+	atf_add_test_case max_seek
+	atf_add_test_case seek_overflow
 }