OpenZFS 7496 - cmp_ds_cont has never worked

Authored by: John Wren Kennedy <john.kennedy@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
OpenZFS-issue: https://www.illumos.org/issues/7496
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/5dc1fd7
Closes #5781

diff --git a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
index 6ed9596a977bfaf721540363d4cf0a402407718d..7adb064f4c52bfbfa23b6ff1680f5037f2f3defd 100644 (file)
--- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
+++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
@@ -187,7 +187,7 @@ function cmp_ds_cont
        dstdir=$(get_prop mountpoint $dst_fs)
 
        $DIFF -r $srcdir $dstdir > /dev/null 2>&1
-       echo $?
+       return $?
 }
 
 #

diff --git a/tests/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh b/tests/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh
index b057953ed68e1f4f8f9d331278bbbe65c4df4da8..e08bd80bf8314dda014cd4e68d516cf68dbd6730 100755 (executable)
--- a/tests/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/rsend_007_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -76,7 +76,6 @@ log_must eval "$ZFS send -R $POOL@final > $BACKDIR/pool-final-R"
 log_must eval "$ZFS receive -d -F $POOL2 < $BACKDIR/pool-final-R"
 dstds=$(get_dst_ds $POOL $POOL2)
 log_must cmp_ds_subs $POOL $dstds
-log_must cmp_ds_cont $POOL $dstds
 
 #
 # Verify zfs send -R -I should succeed
@@ -94,6 +93,5 @@ else
        $ZFS receive -d -F $dstds < $BACKDIR/pool-init-final-IR
 fi
 log_must cmp_ds_subs $POOL $dstds
-log_must cmp_ds_cont $POOL $dstds
 
 log_pass "Rename parent filesystem name will not change the dependent order."

diff --git a/tests/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh b/tests/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
index d771a83369493447f7844e33a59b04358077d574..fa8aa3bd5930769b834a489f2c4b90b98baf322e 100755 (executable)
--- a/tests/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2013 by Delphix. All rights reserved.
+# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/rsend/rsend.kshlib
@@ -116,9 +116,7 @@ fi
 log_must cmp_ds_subs $POOL $dstds
 typeset -i i=0
 while ((i < ${#pair[@]})); do
-       log_must cmp_ds_cont ${pair[$i]} ${pair[((i+1))]}
        log_must cmp_ds_prop ${pair[$i]} ${pair[((i+1))]}
-
        ((i += 2))
 done