diff options
| author | Alan Conway <aconway@apache.org> | 2009-12-16 19:31:20 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-12-16 19:31:20 +0000 |
| commit | fdd3929e6520ce4c75bd95801d8187ebe045a19b (patch) | |
| tree | a1c4f9d5e7f60a43f88e5e7fe09bab4e07190efc /cpp/src | |
| parent | 5a0fddf5bc6a053bfcaff88a4d259fe5dd314146 (diff) | |
| download | qpid-python-fdd3929e6520ce4c75bd95801d8187ebe045a19b.tar.gz | |
QPID-2282: test_watchdog failing due to incorrect use of env. vars
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@891395 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/cluster/WatchDogPlugin.cpp | 2 | ||||
| -rwxr-xr-x | cpp/src/tests/test_watchdog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/WatchDogPlugin.cpp b/cpp/src/qpid/cluster/WatchDogPlugin.cpp index 43dba5e09b..fc2b830dac 100644 --- a/cpp/src/qpid/cluster/WatchDogPlugin.cpp +++ b/cpp/src/qpid/cluster/WatchDogPlugin.cpp @@ -113,7 +113,7 @@ struct WatchDogPlugin : public qpid::Plugin, public qpid::sys::Fork { protected: void child() { // Child of fork - const char* watchdog = ::getenv("QPID_WATCHDOG_EXE"); // For use in tests + const char* watchdog = ::getenv("QPID_WATCHDOG_EXEC"); // For use in tests if (!watchdog) watchdog=QPID_EXEC_DIR "/qpidd_watchdog"; std::string interval = boost::lexical_cast<std::string>(settings.interval); ::execl(watchdog, watchdog, interval.c_str(), NULL); diff --git a/cpp/src/tests/test_watchdog b/cpp/src/tests/test_watchdog index b9e0f4cd08..5afdaa5e24 100755 --- a/cpp/src/tests/test_watchdog +++ b/cpp/src/tests/test_watchdog @@ -21,6 +21,7 @@ # Tests for the watchdog plug-in +source ./test_env.sh # Start a broker with watchdog, freeze it with kill -STOP, verify that it is killed. 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` || exit 1 PID=`$QPIDD_EXEC --no-module-dir -cp $PORT` || exit 1 |