diff options
| author | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
| commit | 9bd37c771305c1744470bb24f5bf515ce8af5520 (patch) | |
| tree | ebccd7439ee2459aa7fe4f51fd2957dd4ce331fa /cpp/src/tests/test_watchdog | |
| parent | 260ac89e2ac7596cd4ede19cbfb9c01dc7769827 (diff) | |
| download | qpid-python-9bd37c771305c1744470bb24f5bf515ce8af5520.tar.gz | |
Run cluster tests under cmake.
Various other test fixes.
- Env vars to abstract different library location under cmake/automake.
- More consistent use of env vars test_env.sh in test scripts.
- Fix replication/replicating_exchange mismatch.
- Add --no-module-dir to prevent accidentally loading modules.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@886259 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/test_watchdog')
| -rwxr-xr-x | cpp/src/tests/test_watchdog | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/cpp/src/tests/test_watchdog b/cpp/src/tests/test_watchdog index c2f33501b8..2e9967ee24 100755 --- a/cpp/src/tests/test_watchdog +++ b/cpp/src/tests/test_watchdog @@ -1,10 +1,29 @@ #!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + # Tests for the watchdog plug-in # Start a broker with watchdog, freeze it with kill -STOP, verify that it is killed. -export QPID_WATCHDOG_EXE=$PWD/../qpidd_watchdog -PORT=`../qpidd -dp0 --no-data-dir --auth=no --no-module-dir --load-module $PWD/../.libs/watchdog.so --log-to-file=qpidd_watchdog.log --watchdog-interval 1` -PID=`../qpidd -cp $PORT` +PORT=`$QPIDD_EXEC -dp0 --no-data-dir --auth=no --no-module-dir --load-module $WATCHDOG_LIB --log-to-file=qpidd_watchdog.log --watchdog-interval 1` +PID=`$QPIDD_EXEC --no-module-dir -cp $PORT` kill -STOP $PID sleep 2 |