tlevine/urchin
1
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

improve readlink degredation

Browse Source
This commit is contained in:
Thomas Levine 2012-10-11 14:25:40 -04:00
parent 10802b89df
commit f85970e7a8
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/mac/.bin/readlink Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
echo This is broken on Mac. 1>&2
exit 1

4
tests/mac/handle broken readlink Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
export PATH="$PWD/.bin:$PATH"
urchin .test

18
urchin
View File

@ -52,12 +52,12 @@ recurse() {
# On success, print a '✓' # On success, print a '✓'
echo -ne '\033[32m✓ \033[0m' echo -ne '\033[32m✓ \033[0m'
echo "${potential_test}" echo "${potential_test}"
echo "${potential_test} passed" >> "$logfile" [ -z "$logfile" ] || echo "${potential_test} passed" >> "$logfile"
else else
# On fail, print a red '✗' # On fail, print a red '✗'
echo -ne '\033[31m✗ \033[0m' echo -ne '\033[31m✗ \033[0m'
echo "${potential_test}" echo "${potential_test}"
echo "${potential_test} failed" >> "$logfile" [ -z "$logfile" ] || echo "${potential_test} failed" >> "$logfile"
cat $stdout_file cat $stdout_file
fi fi
rm $stdout_file rm $stdout_file
@ -83,12 +83,12 @@ urchin_help() {
urchin_go() { urchin_go() {
echo Running tests echo Running tests
echo > "$logfile" [ -z "$logfile" ] || echo > "$logfile"
recurse "$1" 0 recurse "$1" 0
echo Done echo Done
echo $(grep -e 'passed$' "$logfile"|wc -l) tests passed. [ -z "$logfile" ] || echo $(grep -e 'passed$' "$logfile"|wc -l) tests passed.
echo $(grep -e 'failed$' "$logfile"|wc -l) tests failed. [ -z "$logfile" ] || echo $(grep -e 'failed$' "$logfile"|wc -l) tests failed.
} }
urchin_molly_guard() { urchin_molly_guard() {
@ -118,7 +118,8 @@ do
done done
# Constants # Constants
logfile=$(readlink -f "$1/.urchin.log") logfile=$(readlink -f "$1/.urchin.log") ||
echo readlink -f is not supported, so some features are not available. 1>&2
stdout_file=/tmp/urchin_stdout stdout_file=/tmp/urchin_stdout
# Help first # Help first
@ -128,8 +129,11 @@ $HELP && urchin_help
[ "$#" = '1' ] && [ -d "$1" ] || [ "$#" = '1' ] && [ -d "$1" ] ||
( echo "$USAGE" && exit 1 ) ( echo "$USAGE" && exit 1 )
# Expand the starting directory if readlink -f works.
startdir=$(readlink -f "$1" 2> /dev/null) || startdir="$1"
# Run or present the Molly guard. # Run or present the Molly guard.
if echo "$(basename "$(readlink -f "$1")")" | grep test || $FORCE if echo "$startdir" | grep test || $FORCE
then then
urchin_go "$1" urchin_go "$1"
else else