Merge branch 'upstream'

[mirror_zfs-debian.git] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cc8c6960279750ab8ba82c6d341c3392c29d488f..3dc1e67fbefd075836fcbe8a19c8e360b2b95913 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,9 +1,10 @@
-SUBDIRS = zpool-config zpios-test zpios-profile
+SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 dist_pkglibexec_SCRIPTS = \
        $(top_builddir)/scripts/common.sh \
        $(top_srcdir)/scripts/zconfig.sh \
+       $(top_srcdir)/scripts/zfault.sh \
        $(top_srcdir)/scripts/zfs.sh \
        $(top_srcdir)/scripts/zpool-create.sh \
        $(top_srcdir)/scripts/zpios.sh \
@@ -12,6 +13,7 @@ dist_pkglibexec_SCRIPTS = \
 
 ZFS=$(top_builddir)/scripts/zfs.sh
 ZCONFIG=$(top_builddir)/scripts/zconfig.sh
+ZFAULT=$(top_builddir)/scripts/zfault.sh
 ZTEST=$(top_builddir)/cmd/ztest/ztest
 ZPIOS_SANITY=$(top_builddir)/scripts/zpios-sanity.sh
 
@@ -34,6 +36,7 @@ clean:
        done
 
 check:
+       @$(ZFS) -u
        @echo
        @echo -n "===================================="
        @echo -n " ZTEST "
@@ -48,7 +51,13 @@ check:
        @echo -n " ZCONFIG "
        @echo    "==================================="
        @echo
-       @$(ZCONFIG)
+       @$(ZCONFIG) -c
+       @echo
+       @echo -n "==================================="
+       @echo -n " ZFAULT "
+       @echo    "==================================="
+       @echo
+       @$(ZFAULT) -c
        @echo
        @echo -n "===================================="
        @echo -n " ZPIOS "