Merge commit 'refs/top-bases/top' into top
This commit is contained in:
commit
b1452cb3bb
|
@ -222,7 +222,7 @@ EXTRA_DIST = zfs-update.sh $(nobase_pkglibexec_SCRIPTS)
|
||||||
ZFS = ${top_srcdir}/scripts/zfs.sh
|
ZFS = ${top_srcdir}/scripts/zfs.sh
|
||||||
ZCONFIG = ${top_srcdir}/scripts/zconfig.sh
|
ZCONFIG = ${top_srcdir}/scripts/zconfig.sh
|
||||||
ZTEST = ${top_builddir}/cmd/ztest/ztest
|
ZTEST = ${top_builddir}/cmd/ztest/ztest
|
||||||
ZPIOS = ${top_srcdir}/scripts/zpios.sh
|
ZPIOS_SANITY = ${top_srcdir}/scripts/zpios-sanity.sh
|
||||||
all: all-am
|
all: all-am
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
@ -436,14 +436,7 @@ check:
|
||||||
@echo "===================================="
|
@echo "===================================="
|
||||||
@echo
|
@echo
|
||||||
@$(ZFS)
|
@$(ZFS)
|
||||||
@$(ZPIOS) -c file-raid0 -t tiny
|
@$(ZPIOS_SANITY)
|
||||||
@$(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
|
|
||||||
@$(ZFS) -u
|
@$(ZFS) -u
|
||||||
@echo
|
@echo
|
||||||
# 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.
|
||||||
|
|
Loading…
Reference in New Issue