From 04dba10b9af1d3d9a3d35fc592679e0e8f0b7c3f Mon Sep 17 00:00:00 2001 From: Emanuele Aina Date: Fri, 3 May 2013 17:48:31 +0100 Subject: [PATCH] Fix the setup/teardown urchin test scripts under zsh The v* glob expansions were failing with an error under zsh, just set nullglob/NULL_GLOB and make both bash and zsh happier. --- test/fast/setup | 3 +++ test/fast/setup_dir | 3 +++ test/fast/teardown | 3 +++ 3 files changed, 9 insertions(+) diff --git a/test/fast/setup b/test/fast/setup index b433b5c..f98394b 100755 --- a/test/fast/setup +++ b/test/fast/setup @@ -4,6 +4,9 @@ cd ../.. # Back up + + type setopt >/dev/null 2>&1 && setopt NULL_GLOB + type shopt >/dev/null 2>&1 && shopt -s nullglob rm -Rf v* src alias mkdir src alias ) diff --git a/test/fast/setup_dir b/test/fast/setup_dir index 1bba6c2..75e67e3 100755 --- a/test/fast/setup_dir +++ b/test/fast/setup_dir @@ -4,6 +4,9 @@ cd ../.. # Back up + + type setopt >/dev/null 2>&1 && setopt NULL_GLOB + type shopt >/dev/null 2>&1 && shopt -s nullglob mkdir -p bak mv v* src alias bak || sleep 0s ) diff --git a/test/fast/teardown b/test/fast/teardown index 954850f..bd269eb 100755 --- a/test/fast/teardown +++ b/test/fast/teardown @@ -3,5 +3,8 @@ # Remove temporary files ( cd ../.. + + type setopt >/dev/null 2>&1 && setopt NULL_GLOB + type shopt >/dev/null 2>&1 && shopt -s nullglob rm -fR v* src alias )