c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correct shellcheck make recipe

Browse Source 
Consolidated the shellcheck call in the
make recipe down to a single call of
shellcheck. Corrected script errors that
have been skipped. Corrected script errors
that have been introduced because make
wasn't reporting any errors from shellcheck.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Closes #5976
This commit is contained in:
Giuseppe Di Natale 2017-04-06 17:16:41 -07:00 committed by Brian Behlendorf
parent bbfd6354a8
commit 7469863167
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -52,16 +52,12 @@ cstyle:
shellcheck: shellcheck:
@if type shellcheck > /dev/null 2>&1; then \ @if type shellcheck > /dev/null 2>&1; then \
shellcheck --exclude=SC1090 --format gcc scripts/paxcheck.sh \ shellcheck --exclude=SC1090 --format=gcc scripts/paxcheck.sh \
scripts/zloop.sh \ scripts/zloop.sh \
scripts/zfs-tests.sh \ scripts/zfs-tests.sh \
scripts/zfs.sh \ scripts/zfs.sh \
scripts/commitcheck.sh; \ scripts/commitcheck.sh \
(find cmd/zed/zed.d/*.sh -type f) | \ $$(find cmd/zed/zed.d/*.sh -type f); \
grep -v 'zfs-script-config' | \
while read file; do \
shellcheck --exclude=SC1090 --format gcc "$$file"; \
done; \
fi fi
lint: cppcheck paxcheck lint: cppcheck paxcheck

36
scripts/zfs-tests.sh
View File

@ -75,7 +75,7 @@ cleanup() {
done done
# Preserve in-tree symlinks to aid debugging. # Preserve in-tree symlinks to aid debugging.
if [ -z "${INTREE}" -a -d "$STF_PATH" ]; then if [ -z "${INTREE}" ] && [ -d "$STF_PATH" ]; then
rm -Rf "$STF_PATH" rm -Rf "$STF_PATH"
fi fi
} }
@ -89,7 +89,7 @@ trap cleanup EXIT
# #
cleanup_all() { cleanup_all() {
local TEST_POOLS local TEST_POOLS
TEST_POOLS=$(sudo $ZPOOL list -H -o name | grep testpool) TEST_POOLS=$(sudo "$ZPOOL" list -H -o name | grep testpool)
local TEST_LOOPBACKS local TEST_LOOPBACKS
TEST_LOOPBACKS=$(sudo "${LOSETUP}" -a|grep file-vdev|cut -f1 -d:) TEST_LOOPBACKS=$(sudo "${LOSETUP}" -a|grep file-vdev|cut -f1 -d:)
local TEST_FILES local TEST_FILES
@ -99,7 +99,7 @@ cleanup_all() {
msg "--- Cleanup ---" msg "--- Cleanup ---"
msg "Removing pool(s): $(echo "${TEST_POOLS}" | tr '\n' ' ')" msg "Removing pool(s): $(echo "${TEST_POOLS}" | tr '\n' ' ')"
for TEST_POOL in $TEST_POOLS; do for TEST_POOL in $TEST_POOLS; do
sudo $ZPOOL destroy "${TEST_POOL}" sudo "$ZPOOL" destroy "${TEST_POOL}"
done done
msg "Removing dm(s): $(sudo "${DMSETUP}" ls | msg "Removing dm(s): $(sudo "${DMSETUP}" ls |
@ -159,20 +159,20 @@ create_links() {
local dir_list="$1" local dir_list="$1"
local file_list="$2" local file_list="$2"
[ -n $STF_PATH ] || fail "STF_PATH wasn't correctly set" [ -n "$STF_PATH" ] || fail "STF_PATH wasn't correctly set"
for i in $file_list; do for i in $file_list; do
for j in $dir_list; do for j in $dir_list; do
[ ! -e "$STF_PATH/$i" ] || continue [ ! -e "$STF_PATH/$i" ] || continue
if [ ! -d "$j/$i" -a -e "$j/$i" ]; then if [ ! -d "$j/$i" ] && [ -e "$j/$i" ]; then
ln -s $j/$i $STF_PATH/$i || \ ln -s "$j/$i" "$STF_PATH/$i" || \
fail "Couldn't link $i" fail "Couldn't link $i"
break break
fi fi
done done
[ ! -e $STF_PATH/$i ] && STF_MISSING_BIN="$STF_MISSING_BIN$i " [ ! -e "$STF_PATH/$i" ] && STF_MISSING_BIN="$STF_MISSING_BIN$i "
done done
} }
@ -182,7 +182,7 @@ create_links() {
# convenience, otherwise a temporary directory is used. # convenience, otherwise a temporary directory is used.
# #
constrain_path() { constrain_path() {
. $STF_SUITE/include/commands.cfg . "$STF_SUITE/include/commands.cfg"
if [ -n "${INTREE}" ]; then if [ -n "${INTREE}" ]; then
STF_PATH="$BUILDDIR/bin" STF_PATH="$BUILDDIR/bin"
@ -195,7 +195,7 @@ constrain_path() {
fi fi
STF_MISSING_BIN="" STF_MISSING_BIN=""
chmod 755 $STF_PATH || fail "Couldn't chmod $STF_PATH" chmod 755 "$STF_PATH" || fail "Couldn't chmod $STF_PATH"
# Standard system utilities # Standard system utilities
create_links "/bin /usr/bin /sbin /usr/sbin" "$SYSTEM_FILES" create_links "/bin /usr/bin /sbin /usr/sbin" "$SYSTEM_FILES"
@ -219,12 +219,12 @@ constrain_path() {
fi fi
# Exceptions # Exceptions
ln -fs $STF_PATH/awk $STF_PATH/nawk ln -fs "$STF_PATH/awk" "$STF_PATH/nawk"
ln -fs /sbin/mkfs.ext2 $STF_PATH/newfs ln -fs /sbin/mkfs.ext2 "$STF_PATH/newfs"
ln -fs $STF_PATH/gzip $STF_PATH/compress ln -fs "$STF_PATH/gzip" "$STF_PATH/compress"
ln -fs $STF_PATH/gunzip $STF_PATH/uncompress ln -fs "$STF_PATH/gunzip" "$STF_PATH/uncompress"
ln -fs $STF_PATH/exportfs $STF_PATH/share ln -fs "$STF_PATH/exportfs" "$STF_PATH/share"
ln -fs $STF_PATH/exportfs $STF_PATH/unshare ln -fs "$STF_PATH/exportfs" "$STF_PATH/unshare"
} }
# #
@ -396,7 +396,7 @@ constrain_path
# #
# Check if ksh exists # Check if ksh exists
# #
[ -e $STF_PATH/ksh ] || fail "This test suite requires ksh." [ -e "$STF_PATH/ksh" ] || fail "This test suite requires ksh."
# #
# Verify the ZFS module stack if loaded. # Verify the ZFS module stack if loaded.
@ -414,7 +414,7 @@ fi
# By default preserve any existing pools # By default preserve any existing pools
# #
if [ -z "${KEEP}" ]; then if [ -z "${KEEP}" ]; then
KEEP=$(sudo $ZPOOL list -H -o name) KEEP=$(sudo "$ZPOOL" list -H -o name)
if [ -z "${KEEP}" ]; then if [ -z "${KEEP}" ]; then
KEEP="rpool" KEEP="rpool"
fi fi
@ -422,7 +422,7 @@ fi
__ZFS_POOL_EXCLUDE="$(echo $KEEP | sed ':a;N;s/\n/ /g;ba')" __ZFS_POOL_EXCLUDE="$(echo $KEEP | sed ':a;N;s/\n/ /g;ba')"
. $STF_SUITE/include/default.cfg . "$STF_SUITE/include/default.cfg"
msg msg
msg "--- Configuration ---" msg "--- Configuration ---"