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

This commit is contained in:
Brian Behlendorf 2009-03-18 15:09:55 -07:00
commit 09c62e6420
2 changed files with 14 additions and 13 deletions

View File

@ -532,9 +532,6 @@ uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS
tags uninstall uninstall-am uninstall-info-am \ tags uninstall uninstall-am uninstall-info-am \
uninstall-sbinPROGRAMS uninstall-sbinPROGRAMS
check:
./ztest -V
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

View File

@ -197,6 +197,9 @@ target_vendor = @target_vendor@
SUBDIRS = zpool-config zpios-test zpios-profile SUBDIRS = zpool-config zpios-test zpios-profile
EXTRA_DIST = common.sh zfs-update.sh zfs.sh zpool-create.sh zpios.sh \ EXTRA_DIST = common.sh zfs-update.sh zfs.sh zpool-create.sh zpios.sh \
zpios-survey.sh zpios-survey.sh
ZFS = ${top_srcdir}/scripts/zfs.sh
ZTEST = ${top_builddir}/cmd/ztest/ztest
ZPIOS = ${top_srcdir}/scripts/zpios.sh
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:
@ -507,16 +510,17 @@ uninstall-info: uninstall-info-recursive
check: check:
./zfs.sh -v $(ZFS) -v
./zpios.sh -c file-raid0 -t tiny $(ZTEST) -V
./zpios.sh -c file-raid10 -t tiny $(ZPIOS) -c file-raid0 -t tiny
./zpios.sh -c file-raidz -t tiny $(ZPIOS) -c file-raid10 -t tiny
./zpios.sh -c file-raidz2 -t tiny $(ZPIOS) -c file-raidz -t tiny
./zpios.sh -c lo-raid0 -t tiny $(ZPIOS) -c file-raidz2 -t tiny
./zpios.sh -c lo-raid10 -t tiny $(ZPIOS) -c lo-raid0 -t tiny
./zpios.sh -c lo-raidz -t tiny $(ZPIOS) -c lo-raid10 -t tiny
./zpios.sh -c lo-raidz2 -t tiny $(ZPIOS) -c lo-raidz -t tiny
./zfs.sh -vu $(ZPIOS) -c lo-raidz2 -t tiny
$(ZFS) -vu
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT: