Merge PR https://github.com/EmileVauge/traefik/pull/3

2015-09-22 11:29:41 +02:00 · 2015-09-22 11:29:41 +02:00 · 8825a26ae6
commit 8825a26ae6
parent 967e033b7e
593 changed files with 88072 additions and 28 deletions
--- a/script/test-unit
+++ b/script/test-unit
@ -17,6 +17,7 @@ find_dirs() {
    find . -not \( \
         \( \
         -path './integration/*' \
+         -o -path './Godeps/*' \
         -o -path './.git/*' \
         \) \
         -prune \
@ -33,7 +34,7 @@ TESTS_FAILED=()

 for dir in $TESTDIRS; do
    echo '+ go test' $TESTFLAGS "${dir}"
-    go test ${TESTFLAGS} ${dir}
+    godep go test ${TESTFLAGS} ${dir}
    if [ $? != 0 ]; then
        TESTS_FAILED+=("$dir")
        echo