diff options
81 files changed, 126 insertions, 49 deletions
diff --git a/config-model/src/test/sh/test-schema.sh b/config-model/src/test/sh/test-schema.sh index 1be13452c1b..d9e88283568 100755 --- a/config-model/src/test/sh/test-schema.sh +++ b/config-model/src/test/sh/test-schema.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 pushd src/main && make popd diff --git a/configd/src/tests/configd/run-sentinel.sh b/configd/src/tests/configd/run-sentinel.sh index 97ba32d34e8..0a0f8e80bf2 100755 --- a/configd/src/tests/configd/run-sentinel.sh +++ b/configd/src/tests/configd/run-sentinel.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 if ../../apps/sentinel/config-sentinel > tmp.log 2>&1 ; then echo "Should need argument" diff --git a/fsa/src/alltest/alltest.sh b/fsa/src/alltest/alltest.sh index 37274721e25..ad9994b7464 100755 --- a/fsa/src/alltest/alltest.sh +++ b/fsa/src/alltest/alltest.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ./detector_test.sh ./fsa_test.sh ./fsa_fsa_create_test_app diff --git a/fsa/src/alltest/detector_test.sh b/fsa/src/alltest/detector_test.sh index dd6f650a35c..73748a3382e 100755 --- a/fsa/src/alltest/detector_test.sh +++ b/fsa/src/alltest/detector_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e ./fsa_detector_test_app < testinput.txt > detector_test.output diff detector_test.output detector_test.out diff --git a/fsa/src/alltest/fsa_test.sh b/fsa/src/alltest/fsa_test.sh index 497fd291c4d..09470044430 100755 --- a/fsa/src/alltest/fsa_test.sh +++ b/fsa/src/alltest/fsa_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e ./fsa_fsa_test_app > fsa_test.output diff fsa_test.output fsa_test.out diff --git a/fsa/src/alltest/lookup_test.sh b/fsa/src/alltest/lookup_test.sh index 394baecc78a..1732e21de65 100755 --- a/fsa/src/alltest/lookup_test.sh +++ b/fsa/src/alltest/lookup_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e ./fsa_lookup_test_app __testfsa__.__fsa__ < testinput.txt > lookup_test.output diff lookup_test.output lookup_test.out diff --git a/fsa/src/alltest/ngram_test.sh b/fsa/src/alltest/ngram_test.sh index 85559d6e391..6116737c5fa 100755 --- a/fsa/src/alltest/ngram_test.sh +++ b/fsa/src/alltest/ngram_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e ./fsa_ngram_test_app > ngram_test.output diff ngram_test.output ngram_test.out diff --git a/fsa/src/alltest/segmenter_test.sh b/fsa/src/alltest/segmenter_test.sh index d36a6d10057..d5c84f6af34 100755 --- a/fsa/src/alltest/segmenter_test.sh +++ b/fsa/src/alltest/segmenter_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e ./fsa_segmenter_test_app < testinput.txt > segmenter_test.output diff segmenter_test.output segmenter_test.out diff --git a/fsa/src/alltest/vectorizer_test.sh b/fsa/src/alltest/vectorizer_test.sh index 03d794fc6e8..f1d70397472 100755 --- a/fsa/src/alltest/vectorizer_test.sh +++ b/fsa/src/alltest/vectorizer_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e ./fsa_vectorizer_test_app < testinput.txt > vectorizer_test.output diff vectorizer_test.output vectorizer_test.out diff --git a/jrt_test/src/tests/echo/dotest.sh b/jrt_test/src/tests/echo/dotest.sh index a01bf1e06ef..a4b9cc4d313 100644 --- a/jrt_test/src/tests/echo/dotest.sh +++ b/jrt_test/src/tests/echo/dotest.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 . ../../binref/env.sh export PORT_2 diff --git a/jrt_test/src/tests/echo/echo_test.sh b/jrt_test/src/tests/echo/echo_test.sh index df6d98eaaf1..8b68357e606 100755 --- a/jrt_test/src/tests/echo/echo_test.sh +++ b/jrt_test/src/tests/echo/echo_test.sh @@ -1,5 +1,5 @@ #!/bin/bash set -e . ../../binref/env.sh -sh dotest.sh || (sh $BINREF/progctl.sh progdefs.sh stop all; false) -sh $BINREF/progctl.sh progdefs.sh stop all +bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) +bash -e $BINREF/progctl.sh progdefs.sh stop all diff --git a/jrt_test/src/tests/echo/progdefs.sh b/jrt_test/src/tests/echo/progdefs.sh index 4a3053ad64e..d405f525e33 100644 --- a/jrt_test/src/tests/echo/progdefs.sh +++ b/jrt_test/src/tests/echo/progdefs.sh @@ -1,2 +1,4 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog javaserver 1 "tcp/$PORT_2" "$BINREF/runjava SimpleServer" diff --git a/jrt_test/src/tests/mandatory-methods/dotest.sh b/jrt_test/src/tests/mandatory-methods/dotest.sh index 25560a6210d..6c7dfb2bbea 100644 --- a/jrt_test/src/tests/mandatory-methods/dotest.sh +++ b/jrt_test/src/tests/mandatory-methods/dotest.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 sh $BINREF/progctl.sh progdefs.sh start javaserver 1 diff --git a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh index 3088682ef91..81eb00776c8 100755 --- a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh +++ b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh @@ -6,6 +6,5 @@ export PORT_1 $BINREF/compilejava RPCServer.java -sh dotest.sh || (sh $BINREF/progctl.sh progdefs.sh stop all; false) -sh $BINREF/progctl.sh progdefs.sh stop all - +bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) +bash -e $BINREF/progctl.sh progdefs.sh stop all diff --git a/jrt_test/src/tests/mandatory-methods/progdefs.sh b/jrt_test/src/tests/mandatory-methods/progdefs.sh index aa7ae4ab3ca..a376f7585ab 100644 --- a/jrt_test/src/tests/mandatory-methods/progdefs.sh +++ b/jrt_test/src/tests/mandatory-methods/progdefs.sh @@ -1,2 +1,4 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog javaserver 1 "tcp/$PORT_1" "$BINREF/runjava RPCServer" diff --git a/jrt_test/src/tests/mockup-invoke/dotest.sh b/jrt_test/src/tests/mockup-invoke/dotest.sh index 3bd15b6437f..fcbdc16f92e 100644 --- a/jrt_test/src/tests/mockup-invoke/dotest.sh +++ b/jrt_test/src/tests/mockup-invoke/dotest.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 sh $BINREF/progctl.sh progdefs.sh start server 1 diff --git a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh index d5ac8535393..84343a7a60b 100755 --- a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh +++ b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh @@ -7,5 +7,5 @@ export PORT_0 $BINREF/compilejava MockupInvoke.java -sh dotest.sh || (sh $BINREF/progctl.sh progdefs.sh stop all; false) -sh $BINREF/progctl.sh progdefs.sh stop all +bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) +bash -e $BINREF/progctl.sh progdefs.sh stop all diff --git a/jrt_test/src/tests/mockup-invoke/progdefs.sh b/jrt_test/src/tests/mockup-invoke/progdefs.sh index 4c483b8060b..6898513badc 100644 --- a/jrt_test/src/tests/mockup-invoke/progdefs.sh +++ b/jrt_test/src/tests/mockup-invoke/progdefs.sh @@ -1,2 +1,4 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog server 1 "tcp/$PORT_0" "./jrt_test_mockup-server_app" diff --git a/jrt_test/src/tests/rpc-error/dotest.sh b/jrt_test/src/tests/rpc-error/dotest.sh index 2e37525857f..58f74247536 100644 --- a/jrt_test/src/tests/rpc-error/dotest.sh +++ b/jrt_test/src/tests/rpc-error/dotest.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 . ../../binref/env.sh diff --git a/jrt_test/src/tests/rpc-error/progdefs.sh b/jrt_test/src/tests/rpc-error/progdefs.sh index 815aa5a960e..cd915602b9e 100644 --- a/jrt_test/src/tests/rpc-error/progdefs.sh +++ b/jrt_test/src/tests/rpc-error/progdefs.sh @@ -1,3 +1,5 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog cppserver 1 "tcp/$CPP_PORT" "$BINREF/simpleserver" prog javaserver 1 "tcp/$JAVA_PORT" "$BINREF/runjava SimpleServer" diff --git a/jrt_test/src/tests/rpc-error/rpc-error_test.sh b/jrt_test/src/tests/rpc-error/rpc-error_test.sh index a5ef9ac5b3e..c9f47cf10fa 100755 --- a/jrt_test/src/tests/rpc-error/rpc-error_test.sh +++ b/jrt_test/src/tests/rpc-error/rpc-error_test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e . ../../binref/env.sh @@ -12,6 +12,5 @@ export CPP_PORT $BINREF/compilejava TestErrors.java -sh dotest.sh || (sh $BINREF/progctl.sh progdefs.sh stop all; false) -sh $BINREF/progctl.sh progdefs.sh stop all - +bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) +bash -e $BINREF/progctl.sh progdefs.sh stop all diff --git a/jrt_test/src/tests/slobrok-api/dotest.sh b/jrt_test/src/tests/slobrok-api/dotest.sh index 4a221e5830c..23fcc88edc5 100755 --- a/jrt_test/src/tests/slobrok-api/dotest.sh +++ b/jrt_test/src/tests/slobrok-api/dotest.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 . ../../binref/env.sh diff --git a/jrt_test/src/tests/slobrok-api/progdefs.sh b/jrt_test/src/tests/slobrok-api/progdefs.sh index af694ab8ad4..52db8009183 100644 --- a/jrt_test/src/tests/slobrok-api/progdefs.sh +++ b/jrt_test/src/tests/slobrok-api/progdefs.sh @@ -1,2 +1,4 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog slobrok 1 "-p $PORT_8" diff --git a/logd/src/tests/rotate/rotate_test.sh b/logd/src/tests/rotate/rotate_test.sh index 97962e0485c..5c968e25ba7 100755 --- a/logd/src/tests/rotate/rotate_test.sh +++ b/logd/src/tests/rotate/rotate_test.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_TARGET=file:vespa.log diff --git a/lowercasing_test/src/tests/hello-world/dotest.sh b/lowercasing_test/src/tests/hello-world/dotest.sh index 8a183b81148..53f66a84ffe 100755 --- a/lowercasing_test/src/tests/hello-world/dotest.sh +++ b/lowercasing_test/src/tests/hello-world/dotest.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 . ../../binref/env.sh diff --git a/lowercasing_test/src/tests/hello-world/hello-world_test.sh b/lowercasing_test/src/tests/hello-world/hello-world_test.sh index 8895f89feb3..f83dcbe2584 100755 --- a/lowercasing_test/src/tests/hello-world/hello-world_test.sh +++ b/lowercasing_test/src/tests/hello-world/hello-world_test.sh @@ -1,5 +1,5 @@ #!/bin/bash - +set -e . ../../binref/env.sh $BINREF/compilejava HelloWorldLocal.java sh dotest.sh diff --git a/lowercasing_test/src/tests/lowercasing/dotest.sh b/lowercasing_test/src/tests/lowercasing/dotest.sh index 73460c470be..943f35cee67 100755 --- a/lowercasing_test/src/tests/lowercasing/dotest.sh +++ b/lowercasing_test/src/tests/lowercasing/dotest.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 . ../../binref/env.sh diff --git a/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh b/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh index fc639ce970d..4985f6f86f7 100755 --- a/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh +++ b/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh @@ -1,5 +1,6 @@ #!/bin/bash +set -e . ../../binref/env.sh $BINREF/compilejava CasingVariants.java -sh dotest.sh +bash -e dotest.sh diff --git a/messagebus/test/src/tests/compile-java/compile-java_test.sh b/messagebus/test/src/tests/compile-java/compile-java_test.sh index f3da918eae1..9b94ffd51a1 100755 --- a/messagebus/test/src/tests/compile-java/compile-java_test.sh +++ b/messagebus/test/src/tests/compile-java/compile-java_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e . ../../binref/env.sh $BINREF/compilejava TestCompile.java diff --git a/messagebus/test/src/tests/error/ctl.sh b/messagebus/test/src/tests/error/ctl.sh index ea969749808..22178638fe1 100755 --- a/messagebus/test/src/tests/error/ctl.sh +++ b/messagebus/test/src/tests/error/ctl.sh @@ -1,3 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -sh ../../binref/progctl.sh progdefs.sh "$@" +set -e +bash -e ../../binref/progctl.sh progdefs.sh "$@" diff --git a/messagebus/test/src/tests/error/error_test.sh b/messagebus/test/src/tests/error/error_test.sh index bd9ea35643d..e2b567f5823 100755 --- a/messagebus/test/src/tests/error/error_test.sh +++ b/messagebus/test/src/tests/error/error_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e . ../../binref/env.sh $BINREF/compilejava JavaServer.java diff --git a/messagebus/test/src/tests/error/progdefs.sh b/messagebus/test/src/tests/error/progdefs.sh index 2f6f37a9425..92cf767d495 100644 --- a/messagebus/test/src/tests/error/progdefs.sh +++ b/messagebus/test/src/tests/error/progdefs.sh @@ -1,3 +1,5 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog server cpp "" "./messagebus_test_cpp-server-error_app" prog server java "" "../../binref/runjava JavaServer" diff --git a/messagebus/test/src/tests/errorcodes/errorcodes_test.sh b/messagebus/test/src/tests/errorcodes/errorcodes_test.sh index 186de0a5033..7c30378cd1a 100644 --- a/messagebus/test/src/tests/errorcodes/errorcodes_test.sh +++ b/messagebus/test/src/tests/errorcodes/errorcodes_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e . ../../binref/env.sh $BINREF/compilejava DumpCodes.java diff --git a/messagebus/test/src/tests/speed/ctl.sh b/messagebus/test/src/tests/speed/ctl.sh index ea969749808..22178638fe1 100755 --- a/messagebus/test/src/tests/speed/ctl.sh +++ b/messagebus/test/src/tests/speed/ctl.sh @@ -1,3 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -sh ../../binref/progctl.sh progdefs.sh "$@" +set -e +bash -e ../../binref/progctl.sh progdefs.sh "$@" diff --git a/messagebus/test/src/tests/speed/progdefs.sh b/messagebus/test/src/tests/speed/progdefs.sh index 4e0390142cf..ea6e05713f5 100644 --- a/messagebus/test/src/tests/speed/progdefs.sh +++ b/messagebus/test/src/tests/speed/progdefs.sh @@ -1,3 +1,5 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog server cpp "" "./messagebus_test_cpp-server-speed_app" prog server java "" "../../binref/runjava JavaServer" diff --git a/messagebus/test/src/tests/speed/speed_test.sh b/messagebus/test/src/tests/speed/speed_test.sh index f9789961fa7..77eb7e63e0c 100644 --- a/messagebus/test/src/tests/speed/speed_test.sh +++ b/messagebus/test/src/tests/speed/speed_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e . ../../binref/env.sh diff --git a/messagebus/test/src/tests/trace/ctl.sh b/messagebus/test/src/tests/trace/ctl.sh index ea969749808..22178638fe1 100755 --- a/messagebus/test/src/tests/trace/ctl.sh +++ b/messagebus/test/src/tests/trace/ctl.sh @@ -1,3 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -sh ../../binref/progctl.sh progdefs.sh "$@" +set -e +bash -e ../../binref/progctl.sh progdefs.sh "$@" diff --git a/messagebus/test/src/tests/trace/progdefs.sh b/messagebus/test/src/tests/trace/progdefs.sh index fd35b6503e2..b3562f50bdd 100644 --- a/messagebus/test/src/tests/trace/progdefs.sh +++ b/messagebus/test/src/tests/trace/progdefs.sh @@ -1,4 +1,6 @@ +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e prog server cpp1 "" "./messagebus_test_cpp-server-trace_app server/cpp/1/A" prog server cpp2 "" "./messagebus_test_cpp-server-trace_app server/cpp/2/A" prog server cpp3 "" "./messagebus_test_cpp-server-trace_app server/cpp/2/B" diff --git a/messagebus/test/src/tests/trace/trace_test.sh b/messagebus/test/src/tests/trace/trace_test.sh index bfb2edbf870..63005385332 100644 --- a/messagebus/test/src/tests/trace/trace_test.sh +++ b/messagebus/test/src/tests/trace/trace_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e . ../../binref/env.sh diff --git a/persistence/src/tests/proxy/proxy_test.sh b/persistence/src/tests/proxy/proxy_test.sh index a78487831d6..d21a23ec507 100644 --- a/persistence/src/tests/proxy/proxy_test.sh +++ b/persistence/src/tests/proxy/proxy_test.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e $VALGRIND ./persistence_providerstub_test_app $VALGRIND ./persistence_providerproxy_test_app $VALGRIND ./persistence_providerproxy_conformance_test_app diff --git a/searchcore/src/tests/proton/attribute/attribute_test.sh b/searchcore/src/tests/proton/attribute/attribute_test.sh index 950a9f92bb8..968228b03b9 100755 --- a/searchcore/src/tests/proton/attribute/attribute_test.sh +++ b/searchcore/src/tests/proton/attribute/attribute_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e rm -rf test_output $VALGRIND ./searchcore_attribute_test_app diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.sh b/searchcore/src/tests/proton/attribute/attributeflush_test.sh index 8ec2f5d8dd8..830d7b05c60 100755 --- a/searchcore/src/tests/proton/attribute/attributeflush_test.sh +++ b/searchcore/src/tests/proton/attribute/attributeflush_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e rm -rf flush $VALGRIND ./searchcore_attributeflush_test_app diff --git a/searchcore/src/tests/proton/docsummary/docsummary_test.sh b/searchcore/src/tests/proton/docsummary/docsummary_test.sh index 4871911e1cd..968769eb098 100755 --- a/searchcore/src/tests/proton/docsummary/docsummary_test.sh +++ b/searchcore/src/tests/proton/docsummary/docsummary_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e rm -rf tmp rm -rf tmpdb rm -rf summary diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.sh b/searchcore/src/tests/proton/documentdb/documentdb_test.sh index 272ecacbd8b..ae975d561fb 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.sh +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e $VALGRIND ./searchcore_documentdb_test_app rm -rf typea tmp diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh index bc49b207155..5eb03ff07f5 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e $VALGRIND ./searchcore_feedhandler_test_app rm -rf mytlsdir rm -rf myfilecfg diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh index 4d1279a8413..f88c63b1220 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e rm -rf out rm -rf out2 $VALGRIND ./searchcore_fileconfigmanager_test_app diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh index 03fb18363f1..4c334df32d7 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e $VALGRIND ./searchcore_documentmetastore_test_app rm -rf documentmetastore*.dat rm -rf dmsflush diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.sh b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.sh index d03b6309ec9..cfa706ac013 100755 --- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.sh +++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e export PWD=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) $VALGRIND ./searchcore_verify_ranksetup_test_app diff --git a/searchlib/src/tests/attribute/changevector/changevector_test.sh b/searchlib/src/tests/attribute/changevector/changevector_test.sh index cb70f5465a4..23b08c5a637 100644 --- a/searchlib/src/tests/attribute/changevector/changevector_test.sh +++ b/searchlib/src/tests/attribute/changevector/changevector_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e $VALGRIND ./searchlib_changevector_test_app rm -rf *.dat rm -rf *.idx diff --git a/searchlib/src/tests/attribute/extendattributes/extendattribute_test.sh b/searchlib/src/tests/attribute/extendattributes/extendattribute_test.sh index 6f335b18229..193ab23a494 100755 --- a/searchlib/src/tests/attribute/extendattributes/extendattribute_test.sh +++ b/searchlib/src/tests/attribute/extendattributes/extendattribute_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e $VALGRIND ./searchlib_extendattribute_test_app rm -rf *.dat diff --git a/searchlib/src/tests/attribute/guard/attributeguard_test.sh b/searchlib/src/tests/attribute/guard/attributeguard_test.sh index 6a9557e7da7..2f3e65dbc91 100644 --- a/searchlib/src/tests/attribute/guard/attributeguard_test.sh +++ b/searchlib/src/tests/attribute/guard/attributeguard_test.sh @@ -1,4 +1,5 @@ -#!/bin/bahs +#!/bin/bash +set -e $VALGRIND ./searchlib_attributeguard_test_app rm -rf *.dat rm -rf *.idx diff --git a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.sh b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.sh index e6f9c214cb9..afad9aa991a 100755 --- a/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.sh +++ b/searchlib/src/tests/attribute/postinglistattribute/postinglistattribute_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e $VALGRIND ./searchlib_postinglistattribute_test_app rm -rf *.dat rm -rf *.idx diff --git a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.sh b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.sh index 3aae4bfe4d5..2695a8ba51d 100755 --- a/searchlib/src/tests/attribute/searchcontext/searchcontext_test.sh +++ b/searchlib/src/tests/attribute/searchcontext/searchcontext_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e $VALGRIND ./searchlib_searchcontext_test_app rm -rf *.dat rm -rf *.idx diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.sh b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.sh index d7ac263c1c9..b40958b46bd 100755 --- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.sh +++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e $VALGRIND ./searchlib_stringattribute_test_app rm -rf *.dat diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh index 2e940d5d99a..1f24dbafa16 100644 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e $VALGRIND ./searchlib_tensorattribute_test_app rm -rf *.dat diff --git a/searchlib/src/tests/datastore/logdatastore_test.sh b/searchlib/src/tests/datastore/logdatastore_test.sh index 46455e1fae9..0f0b5ac255a 100755 --- a/searchlib/src/tests/datastore/logdatastore_test.sh +++ b/searchlib/src/tests/datastore/logdatastore_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e cp -r bug-7257706 bug-7257706-truncated mkdir dangling-test cp bug-7257706/*.dat dangling-test/ diff --git a/searchlib/src/tests/diskindex/fieldwriter/runtests.sh b/searchlib/src/tests/diskindex/fieldwriter/runtests.sh index 1f2b6d6076f..09055693b5e 100755 --- a/searchlib/src/tests/diskindex/fieldwriter/runtests.sh +++ b/searchlib/src/tests/diskindex/fieldwriter/runtests.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 rm -f new* chkpt* sync diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.sh b/searchlib/src/tests/diskindex/fusion/fusion_test.sh index 5e0ebfe4608..9d4837fb2ac 100755 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.sh +++ b/searchlib/src/tests/diskindex/fusion/fusion_test.sh @@ -13,4 +13,3 @@ $IINSPECT showpostings --transpose --indexdir dump3 > transpose.out $ECHO_CMD dumping posting list for word z in field f0 $IINSPECT showpostings --indexdir dump3 --field f0 z > zwordf0field.out $ECHO_CMD inspection done. - diff --git a/searchlib/src/tests/transactionlog/translogclient_test.sh b/searchlib/src/tests/transactionlog/translogclient_test.sh index bf7ddab1fcf..5efb0b970e9 100755 --- a/searchlib/src/tests/transactionlog/translogclient_test.sh +++ b/searchlib/src/tests/transactionlog/translogclient_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e rm -rf test7 test8 test9 test10 test11 test12 test13 testremove $VALGRIND ./searchlib_translogclient_test_app rm -rf test7 test8 test9 test10 test11 test12 test13 testremove diff --git a/searchlib/src/tests/url/dotest.sh b/searchlib/src/tests/url/dotest.sh index f7ac1fd1e69..d091c625efd 100755 --- a/searchlib/src/tests/url/dotest.sh +++ b/searchlib/src/tests/url/dotest.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 # Run test echo "Testing the FastS_URL class..." diff --git a/searchsummary/src/tests/docsumformat/docsum-index.sh b/searchsummary/src/tests/docsumformat/docsum-index.sh index 0d313191685..94412986683 100755 --- a/searchsummary/src/tests/docsumformat/docsum-index.sh +++ b/searchsummary/src/tests/docsumformat/docsum-index.sh @@ -1,5 +1,6 @@ -#!/bin/sh -e +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +set -e findex=../../../bin/findex diff --git a/searchsummary/src/tests/docsumformat/dotest.sh b/searchsummary/src/tests/docsumformat/dotest.sh index 64097b0061d..056e043de02 100755 --- a/searchsummary/src/tests/docsumformat/dotest.sh +++ b/searchsummary/src/tests/docsumformat/dotest.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 echo "running pack test..." ./docsum-pack > packtest.out 2>&1 diff --git a/searchsummary/src/tests/extractkeywords/runtests.sh b/searchsummary/src/tests/extractkeywords/runtests.sh index 2c09bb25460..1324f3ebc2e 100755 --- a/searchsummary/src/tests/extractkeywords/runtests.sh +++ b/searchsummary/src/tests/extractkeywords/runtests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # # $Id$ @@ -8,6 +8,7 @@ # # All Rights Reserved # +set -e if $VALGRIND ./searchsummary_extractkeywordstest_app - then @@ -26,4 +27,3 @@ else fi echo SUCCESS: searchsummary_extractkeywordstest_app test completed -exit 0 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 diff --git a/staging_vespalib/src/tests/benchmark/benchmark_test.sh b/staging_vespalib/src/tests/benchmark/benchmark_test.sh index ce0a56ee545..f43454fe2a6 100755 --- a/staging_vespalib/src/tests/benchmark/benchmark_test.sh +++ b/staging_vespalib/src/tests/benchmark/benchmark_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e TIME=time $TIME ./staging_vespalib_benchmark_test_app vespalib::ParamByReferenceVectorInt 200000 1 diff --git a/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh b/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh index 57b6c8cb613..6d266f41170 100755 --- a/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh +++ b/staging_vespalib/src/tests/util/process_memory_stats/process_memory_stats_test.sh @@ -1,4 +1,5 @@ -#!/bin/sh +#!/bin/bash +set -e rm -f mapfile $VALGRIND ./staging_vespalib_process_memory_stats_test_app rm -f mapfile diff --git a/vespalib/src/tests/tutorial/compare-tutorials.sh b/vespalib/src/tests/tutorial/compare-tutorials.sh index 2c2aa7f4c44..4e328bb9742 100755 --- a/vespalib/src/tests/tutorial/compare-tutorials.sh +++ b/vespalib/src/tests/tutorial/compare-tutorials.sh @@ -1,5 +1,4 @@ -#!/bin/sh - +#!/bin/bash set -e ./vespalib_make_tutorial_app > tutorial_out.html diff --git a/vespalib/src/vespa/vespalib/testkit/progctl.sh b/vespalib/src/vespa/vespalib/testkit/progctl.sh index 27f2a176adb..5cd53dd0f62 100755 --- a/vespalib/src/vespa/vespalib/testkit/progctl.sh +++ b/vespalib/src/vespa/vespalib/testkit/progctl.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 # define prog entry (called from progdefs file) # $1 - program name diff --git a/vespalib/src/vespa/vespalib/testkit/run-test.sh b/vespalib/src/vespa/vespalib/testkit/run-test.sh index 3380d9c0277..9cd99c03c66 100755 --- a/vespalib/src/vespa/vespalib/testkit/run-test.sh +++ b/vespalib/src/vespa/vespalib/testkit/run-test.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 top_color="bgcolor=\"#ccccff\"" row_color="bgcolor=\"#eeeeff\"" diff --git a/vespalib/src/vespa/vespalib/testkit/testrun.sh b/vespalib/src/vespa/vespalib/testkit/testrun.sh index cea9d310e45..07243d3167e 100755 --- a/vespalib/src/vespa/vespalib/testkit/testrun.sh +++ b/vespalib/src/vespa/vespalib/testkit/testrun.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 top_color="bgcolor=\"#ccccff\"" row_color="bgcolor=\"#eeeeff\"" diff --git a/vespalog/src/test/bufferedlogskiptest_test.sh b/vespalog/src/test/bufferedlogskiptest_test.sh index 50887394bf6..6d618f63355 100755 --- a/vespalog/src/test/bufferedlogskiptest_test.sh +++ b/vespalog/src/test/bufferedlogskiptest_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e rm -f bufferedlogskiptest.log VESPA_LOG_TARGET="file:bufferedlogskiptest.log" VESPA_LOG_LEVEL="all -spam" ./vespalog_bufferedlogskiptest_app bufferedlogskiptest.log diff --git a/vespalog/src/test/bufferedlogtest_test.sh b/vespalog/src/test/bufferedlogtest_test.sh index 0ff927b946d..11b3e596195 100755 --- a/vespalog/src/test/bufferedlogtest_test.sh +++ b/vespalog/src/test/bufferedlogtest_test.sh @@ -1,3 +1,4 @@ #!/bin/bash +set -e rm -f bufferedlogtest.log VESPA_LOG_TARGET="file:bufferedlogtest.log" ./vespalog_bufferedlogtest_app bufferedlogtest.log diff --git a/vespamalloc/src/tests/allocfree/allocfree_benchmark.sh b/vespamalloc/src/tests/allocfree/allocfree_benchmark.sh index 51165dfce71..9ce83366520 100755 --- a/vespamalloc/src/tests/allocfree/allocfree_benchmark.sh +++ b/vespamalloc/src/tests/allocfree/allocfree_benchmark.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e TIME=/usr/bin/time diff --git a/vespamalloc/src/tests/allocfree/allocfree_test.sh b/vespamalloc/src/tests/allocfree/allocfree_test.sh index ac864dc891b..458f8209678 100755 --- a/vespamalloc/src/tests/allocfree/allocfree_test.sh +++ b/vespamalloc/src/tests/allocfree/allocfree_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e TIME=/usr/bin/time diff --git a/vespamalloc/src/tests/doubledelete/doubledelete_test.sh b/vespamalloc/src/tests/doubledelete/doubledelete_test.sh index a43b5e3a406..43c30992aed 100755 --- a/vespamalloc/src/tests/doubledelete/doubledelete_test.sh +++ b/vespamalloc/src/tests/doubledelete/doubledelete_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e LD_PRELOAD=../../../src/vespamalloc/libvespamalloc.so ./vespamalloc_doubledelete_test_app diff --git a/vespamalloc/src/tests/overwrite/overwrite_test.sh b/vespamalloc/src/tests/overwrite/overwrite_test.sh index 8ccac33aecc..0fe73c9b38a 100755 --- a/vespamalloc/src/tests/overwrite/overwrite_test.sh +++ b/vespamalloc/src/tests/overwrite/overwrite_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e LD_PRELOAD=../../../src/vespamalloc/libvespamalloc.so ./vespamalloc_overwrite_test_app LD_PRELOAD=../../../src/vespamalloc/libvespamalloc_vespamallocd.so ./vespamalloc_overwrite_test_app testmemoryfill diff --git a/vespamalloc/src/tests/thread/thread_test.sh b/vespamalloc/src/tests/thread/thread_test.sh index 68654d35ce7..7d9a0bedd86 100755 --- a/vespamalloc/src/tests/thread/thread_test.sh +++ b/vespamalloc/src/tests/thread/thread_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ulimit -u 31215 |