zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2948: Failing c unit tests on apache jenkins
Date Wed, 22 Nov 2017 17:43:28 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/master 851075b5e -> 81fe5262f


ZOOKEEPER-2948: Failing c unit tests on apache jenkins

Author: Abraham Fine <afine@apache.org>

Reviewers: phunt@apache.org

Closes #422 from afine/ZOOKEEPER-2948

Change-Id: I8d5d88d6b5863346dbb963f979ad9e6c9b33025c


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/81fe5262
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/81fe5262
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/81fe5262

Branch: refs/heads/master
Commit: 81fe5262fe9ba47f716fc5b786cffe3d83f51c05
Parents: 851075b
Author: Abraham Fine <afine@apache.org>
Authored: Wed Nov 22 09:41:34 2017 -0800
Committer: Patrick Hunt <phunt@apache.org>
Committed: Wed Nov 22 09:42:56 2017 -0800

----------------------------------------------------------------------
 src/c/tests/zkServer.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/81fe5262/src/c/tests/zkServer.sh
----------------------------------------------------------------------
diff --git a/src/c/tests/zkServer.sh b/src/c/tests/zkServer.sh
index 33ab152..b19e870 100755
--- a/src/c/tests/zkServer.sh
+++ b/src/c/tests/zkServer.sh
@@ -105,12 +105,12 @@ fi
 case $1 in
 start|startClean)
     if [ "x${base_dir}" == "x" ]
-        then
+    then
         mkdir -p /tmp/zkdata
         java -cp "$CLASSPATH" org.apache.zookeeper.server.ZooKeeperServerMain $ZOOPORT /tmp/zkdata
3000 $ZKMAXCNXNS &> /tmp/zk.log &
         pid=$!
         echo -n $! > /tmp/zk.pid
-        else
+    else
         mkdir -p "${base_dir}/build/tmp/zkdata"
         java -cp "$CLASSPATH" org.apache.zookeeper.server.ZooKeeperServerMain $ZOOPORT "${base_dir}/build/tmp/zkdata"
3000 $ZKMAXCNXNS &> "${base_dir}/build/tmp/zk.log" &
         pid=$!
@@ -157,8 +157,8 @@ startReadOnly)
         echo "this target is for unit tests only"
         exit 2
     else
-        mkdir -p /tmp/zkdata
-        rm -f /tmp/zkdata/myid && echo 1 > /tmp/zkdata/myid
+        mkdir -p "${base_dir}/build/tmp/zkdata"
+        rm -f "${base_dir}/build/tmp/zkdata/myid" && echo 1 > "${base_dir}/build/tmp/zkdata/myid"
 
         # force read-only mode
         java -cp "$CLASSPATH" -Dreadonlymode.enabled=true org.apache.zookeeper.server.quorum.QuorumPeerMain
${base_dir}/src/c/tests/quorum.cfg &> "${base_dir}/build/tmp/zk.log" &


Mime
View raw message