GEODE-1937: Fixing failures from the example tests Setting a default GEODE_HOME to use when running example tests. Fixing the example tests scripts to indicate that they are bash scripts as the first line in the header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/62bd240f Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/62bd240f Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/62bd240f Branch: refs/heads/feature/e2e-testing Commit: 62bd240f28258620e5140d52ce21c2004598f7ea Parents: 55a6584 Author: Dan Smith <[email protected]> Authored: Mon Sep 26 11:03:25 2016 -0700 Committer: Dan Smith <[email protected]> Committed: Tue Sep 27 10:43:56 2016 -0700 ---------------------------------------------------------------------- geode-examples/build.gradle | 6 ++++++ geode-examples/replicated/scripts/pidkiller.sh | 5 ++--- geode-examples/replicated/scripts/setEnv.sh | 2 +- geode-examples/replicated/scripts/startAll.sh | 2 +- geode-examples/replicated/scripts/stopAll.sh | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62bd240f/geode-examples/build.gradle ---------------------------------------------------------------------- diff --git a/geode-examples/build.gradle b/geode-examples/build.gradle index 1eadc31..1e638bc 100644 --- a/geode-examples/build.gradle +++ b/geode-examples/build.gradle @@ -48,6 +48,12 @@ subprojects { } } + test { + def geodeHome = System.getenv('GEODE_HOME'); + geodeHome = geodeHome != null ? geodeHome : file('../../geode-assembly/build/install/apache-geode/').absolutePath + environment 'GEODE_HOME': geodeHome + } + } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62bd240f/geode-examples/replicated/scripts/pidkiller.sh ---------------------------------------------------------------------- diff --git a/geode-examples/replicated/scripts/pidkiller.sh b/geode-examples/replicated/scripts/pidkiller.sh index 1a3eaf2..ecf8f2d 100755 --- a/geode-examples/replicated/scripts/pidkiller.sh +++ b/geode-examples/replicated/scripts/pidkiller.sh @@ -1,3 +1,4 @@ +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -14,9 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/bin/bash -# -# @brief Script that look for .pid files on a directory and kill those processes. +# @brief Script that look for .pid files on a directory and kill those processes. # export DIR=$1 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62bd240f/geode-examples/replicated/scripts/setEnv.sh ---------------------------------------------------------------------- diff --git a/geode-examples/replicated/scripts/setEnv.sh b/geode-examples/replicated/scripts/setEnv.sh index 60befc6..e9e860e 100755 --- a/geode-examples/replicated/scripts/setEnv.sh +++ b/geode-examples/replicated/scripts/setEnv.sh @@ -1,3 +1,4 @@ +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -14,7 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/bin/bash ## check if locator port has been set otherwise set to default export GEODE_LOCATOR_PORT="${GEODE_LOCATOR_PORT:-10334}" http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62bd240f/geode-examples/replicated/scripts/startAll.sh ---------------------------------------------------------------------- diff --git a/geode-examples/replicated/scripts/startAll.sh b/geode-examples/replicated/scripts/startAll.sh index f4ce413..2b08f19 100755 --- a/geode-examples/replicated/scripts/startAll.sh +++ b/geode-examples/replicated/scripts/startAll.sh @@ -1,3 +1,4 @@ +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -14,7 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/bin/bash set -e http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/62bd240f/geode-examples/replicated/scripts/stopAll.sh ---------------------------------------------------------------------- diff --git a/geode-examples/replicated/scripts/stopAll.sh b/geode-examples/replicated/scripts/stopAll.sh index 2a2c39b..a6364a8 100755 --- a/geode-examples/replicated/scripts/stopAll.sh +++ b/geode-examples/replicated/scripts/stopAll.sh @@ -1,3 +1,4 @@ +#!/bin/bash # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -14,7 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -#!/bin/bash set -e current=`pwd`
