aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-03-09 09:38:33 +0100
committerKarel Kočí <cynerd@email.cz>2016-03-09 10:09:13 +0100
commit71e77dd87af79e0374b0f502066be0e191cb6667 (patch)
tree2cd6b92b15aa4dcd0a7270a4209e6ae4b852890a /tests
parenta149a27041e90674f34228e7ef1b05b6f1a61ca5 (diff)
downloadmcserver-wrapper-71e77dd87af79e0374b0f502066be0e191cb6667.tar.gz
mcserver-wrapper-71e77dd87af79e0374b0f502066be0e191cb6667.tar.bz2
mcserver-wrapper-71e77dd87af79e0374b0f502066be0e191cb6667.zip
Add Travis status image and fix .travis.yml
In travis configuration was missing some programs for testing. Also fix problems reported by style check.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/all.sh2
-rwxr-xr-xtests/prepare.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/all.sh b/tests/all.sh
index d0fe307..1237154 100755
--- a/tests/all.sh
+++ b/tests/all.sh
@@ -2,4 +2,4 @@
cd "$( dirname "${BASH_SOURCE[0]}" )"
./t_codingstandard.sh
-[[ $? -ne 0 ]] && exit 1
+[[ ! $? -ne 0 ]] || exit 1
diff --git a/tests/prepare.sh b/tests/prepare.sh
index d8248b4..89982c3 100755
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
@@ -9,7 +9,7 @@ cp ../example.conf mcwrapper.conf
if [[ $PREPARED != "y" ]]; then
# Move to known directory
- cd "$( dirname "${BASH_SOURCE[0]}" )"
+ cd "$( readlink -f "${BASH_SOURCE[0]}" )"
if [[ $MCSERVERS == "y" ]]; then
mkdir -p minecraft-server