Skip to content

Commit

Permalink
fix validate on osx
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre Tardy committed Dec 1, 2013
1 parent 3c1652a commit 56381a3
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions common/validate.sh
Expand Up @@ -76,7 +76,6 @@ check_relnotes() {
return 0
fi
}

run_tests() {
if [ -n "${TRIALTMP}" ]; then
TEMP_DIRECTORY_OPT="--temp-directory ${TRIALTMP}"
Expand All @@ -96,8 +95,8 @@ fi

# get a list of changed files, used below; this uses a tempfile to work around
# shell behavior when piping to 'while'
tempfile=$(mktemp)
trap 'rm -f ${tempfile}' 1 2 3 15
tempfile=$(mktemp -t bbvalidate)
trap "rm -f ${tempfile}" 1 2 3 15
git diff --name-only $REVRANGE | grep '\.py$' | grep -v '\(^master/\(contrib\|docs\)\|/setup\.py\)' > ${tempfile}
py_files=()
while read line; do
Expand All @@ -109,9 +108,11 @@ git log "$REVRANGE" --pretty=oneline || exit 1

if $slow; then
status "running 'setup.py develop' for www"
(cd www; python setup.py develop 2>&1 >/dev/null) || not_ok "www/setup.py failed"
(cd www; python setup.py develop 2>&1 >/dev/null ) || not_ok "www/setup.py failed"
status "running 'grunt ci' for www"
(cd www; node_modules/.bin/grunt ci 2>&1 >/dev/null) || not_ok "grunt ci failed"
LOG=/dev/null
if [[ `uname` == "Darwin" ]] ;then LOG=/dev/stdout; fi # grunt >/dev/null hangs on osx ?!
(cd www; node_modules/.bin/grunt --no-color ci 2>&1 >$LOG ) || not_ok "grunt ci failed"
fi
if $slow; then
status "running tests"
Expand Down

0 comments on commit 56381a3

Please sign in to comment.