c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-26 04:07:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

zfstest - replace dircmp with diff

Browse Source 
`dircmp` doesn't exist in Linux while `diff` is already used
by zfstests on all platforms.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Wren Kennedy <john.kennedy@delphix.com>
Signed-off-by: George Melikov <mail@gmelikov.ru>
Closes #5996
This commit is contained in:
George Melikov
2017-04-10 03:17:55 +04:00
committed by Brian Behlendorf
parent f94a5dccf7
commit a8d6ae1e16
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/snapshot/snapshot_002_pos.ksh
+2 -3
View File
@@ -125,9 +125,8 @@ log_must tar xf $TESTDIR/tarball.snapshot.tar
cd $CWD || log_fail "Could not cd $CWD"
dircmp $TESTDIR/original $TESTDIR/snapshot > /tmp/zfs_snapshot2.$$
grep different /tmp/zfs_snapshot2.$$ >/dev/null 2>&1
if [[ $? -ne 1 ]]; then
diff -q -r $TESTDIR/original $TESTDIR/snapshot > /dev/null 2>&1
if [[ $? -eq 1 ]]; then
log_fail "Directory structures differ."
fi
tests/zfs-tests/tests/functional/snapshot/snapshot_006_pos.ksh
+2 -3
View File
@@ -123,9 +123,8 @@ log_must tar xf $TESTDIR1/tarball.snapshot.tar
cd $CWD || log_fail "Could not cd $CWD"
dircmp $TESTDIR1/original $TESTDIR1/snapshot > /tmp/zfs_snapshot2.$$
grep different /tmp/zfs_snapshot2.$$ >/dev/null 2>&1
if [[ $? -ne 1 ]]; then
diff -q -r $TESTDIR1/original $TESTDIR1/snapshot > /dev/null 2>&1
if [[ $? -eq 1 ]]; then
log_fail "Directory structures differ."
fi