diff options
| author | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-06-28 13:20:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 13:20:00 +0200 |
| commit | 7824d2b515cba557c9c4028591ede0b4b9256b77 (patch) | |
| tree | 888581b502ba64706658ead749492708927d1b8a /slobrok | |
| parent | 3962f601fa92e8aba19e3efc230840b9f4f5a5a7 (diff) | |
Fail test scripts on first error (#194)
* Fail test scripts on first error
* Some more test fixes
* Reverted prod_features_test fix
* Re-added prod_features_test.sh change matching that of PR #193
* More error checking
* Reverted set -e on failing tests
* Enable errexit in lowercasing test
Diffstat (limited to 'slobrok')
| -rwxr-xr-x | slobrok/src/tests/multi/multi_test.sh | 3 | ||||
| -rwxr-xr-x | slobrok/src/tests/multi/start.sh | 3 | ||||
| -rwxr-xr-x | slobrok/src/tests/multi/stop.sh | 3 | ||||
| -rwxr-xr-x | slobrok/src/tests/startsome/startsome.sh | 3 | ||||
| -rwxr-xr-x | slobrok/src/tests/startup/run.sh | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/slobrok/src/tests/multi/multi_test.sh b/slobrok/src/tests/multi/multi_test.sh index ffc917c94db..222d7dce3b6 100755 --- a/slobrok/src/tests/multi/multi_test.sh +++ b/slobrok/src/tests/multi/multi_test.sh @@ -1,4 +1,5 @@ -#/bin/bash +#!/bin/bash +set -e ok=true ./start.sh ./slobrok_multi_test_app || ok=false diff --git a/slobrok/src/tests/multi/start.sh b/slobrok/src/tests/multi/start.sh index d45b1f17e3b..48d5e5d4874 100755 --- a/slobrok/src/tests/multi/start.sh +++ b/slobrok/src/tests/multi/start.sh @@ -1,5 +1,6 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e export VESPA_LOG_LEVEL='all -spam' diff --git a/slobrok/src/tests/multi/stop.sh b/slobrok/src/tests/multi/stop.sh index 0089c0b77d3..e2ab6b6f71a 100755 --- a/slobrok/src/tests/multi/stop.sh +++ b/slobrok/src/tests/multi/stop.sh @@ -1,5 +1,6 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e ok=true diff --git a/slobrok/src/tests/startsome/startsome.sh b/slobrok/src/tests/startsome/startsome.sh index e3f9d9ea0dd..2a865988c41 100755 --- a/slobrok/src/tests/startsome/startsome.sh +++ b/slobrok/src/tests/startsome/startsome.sh @@ -1,5 +1,6 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e SBCMD=../../apps/sbcmd/sbcmd SLOBROK=../../apps/slobrok/slobrok diff --git a/slobrok/src/tests/startup/run.sh b/slobrok/src/tests/startup/run.sh index d83dc886113..662dd05b585 100755 --- a/slobrok/src/tests/startup/run.sh +++ b/slobrok/src/tests/startup/run.sh @@ -1,5 +1,6 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e cmd=../../apps/slobrok/slobrok $cmd -c mumbojumbo |