From 45f96c73463a1f17e48610e88a6e103f845fb0c1 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 7 Sep 2018 16:02:25 +1000 Subject: [PATCH] ctdb-event: Force EVENTSCRIPTS_TESTS_VAR_DIR to be absolute Event scripts (well, statd_callout) can change directory, causing stubs to be unable to locate EVENTSCRIPTS_TESTS_VAR_DIR if it is relative. Don't force TEST_VAR_DIR to be absolute because this can result in Unix domain socket names that are too long. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/eventscripts/scripts/local.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index ad683cf9934..c0eb72badd1 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -28,6 +28,9 @@ if [ -d "$EVENTSCRIPTS_TESTS_VAR_DIR" ] ; then fi mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR" +# Force this to be absolute - event scripts can change directory +EVENTSCRIPTS_TESTS_VAR_DIR=$(cd "$EVENTSCRIPTS_TESTS_VAR_DIR" && echo "$PWD") + export CTDB_LOGGING="file:${EVENTSCRIPTS_TESTS_VAR_DIR}/log.ctdb" touch "${CTDB_LOGGING#file:}" || \ die "Unable to setup logging for \"$CTDB_LOGGING\"" -- 2.34.1