Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2009-10-27 15:08:48 -07:00
commit b1452cb3bb
1 changed files with 2 additions and 9 deletions

View File

@ -222,7 +222,7 @@ EXTRA_DIST = zfs-update.sh $(nobase_pkglibexec_SCRIPTS)
ZFS = ${top_srcdir}/scripts/zfs.sh
ZCONFIG = ${top_srcdir}/scripts/zconfig.sh
ZTEST = ${top_builddir}/cmd/ztest/ztest
ZPIOS = ${top_srcdir}/scripts/zpios.sh
ZPIOS_SANITY = ${top_srcdir}/scripts/zpios-sanity.sh
all: all-am
.SUFFIXES:
@ -436,14 +436,7 @@ check:
@echo "===================================="
@echo
@$(ZFS)
@$(ZPIOS) -c file-raid0 -t tiny
@$(ZPIOS) -c file-raid10 -t tiny | tail -1
@$(ZPIOS) -c file-raidz -t tiny | tail -1
@$(ZPIOS) -c file-raidz2 -t tiny | tail -1
@$(ZPIOS) -c lo-raid0 -t tiny | tail -1
@$(ZPIOS) -c lo-raid10 -t tiny | tail -1
@$(ZPIOS) -c lo-raidz -t tiny | tail -1
@$(ZPIOS) -c lo-raidz2 -t tiny | tail -1
@$(ZPIOS_SANITY)
@$(ZFS) -u
@echo
# Tell versions [3.59,3.63) of GNU make to not export all variables.