From 9c22d76019031b0c547b9a4e38dc6c59ff7db588 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 14 Jan 2009 15:38:56 -0800 Subject: [PATCH] Minor 'make check' updates --- cmd/ztest/Makefile.am | 3 +++ configure.ac | 2 +- scripts/Makefile.am | 3 ++- scripts/check.sh | 17 ----------------- 4 files changed, 6 insertions(+), 19 deletions(-) delete mode 100755 scripts/check.sh diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am index c1dae8f592..216089ef1c 100644 --- a/cmd/ztest/Makefile.am +++ b/cmd/ztest/Makefile.am @@ -28,3 +28,6 @@ ztest_LDADD = \ $(top_builddir)/lib/libzfs/libzfs.la ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl + +check: + ./ztest -V diff --git a/configure.ac b/configure.ac index 7bcebd832e..7bc0166ed0 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,6 @@ AC_CONFIG_FILES([ Makefile config/Makefile doc/Makefile - scripts/Makefile lib/Makefile lib/libavl/Makefile lib/libnvpair/Makefile @@ -91,5 +90,6 @@ AC_CONFIG_FILES([ module/zcommon/include/sys/fm/Makefile module/zcommon/include/sys/fm/fs/Makefile module/zfs/Makefile + scripts/Makefile ]) AC_OUTPUT diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4a58a484f0..3448046f5f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST = update-zfs.sh check.sh zfs.sh create-zpool.sh check: - ./check.sh + ./zfs.sh -v + ./zfs.sh -vu diff --git a/scripts/check.sh b/scripts/check.sh deleted file mode 100755 index e4b0e8e06f..0000000000 --- a/scripts/check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -prog=check.sh - -die() { - echo "${prog}: $1" >&2 - exit 1 -} - -if [ $(id -u) != 0 ]; then - die "Must run as root" -fi - -./zfs.sh -v || die "" -./zfs.sh -vu || die "" - -exit 0