aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-12-19 17:31:14 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-12-19 17:31:14 +0100
commit450e67573f4f0e9913d6a73409ea1fe256a406d3 (patch)
treed9ac51ef740d15b346cd6acdcb536bda5c68c15a /lib/sasl
parentc2e497d888456e7720bd3d4123694c444ef9072b (diff)
parent5b9265ad19d6596a8b599eccc64accb67e3c664e (diff)
downloadotp-450e67573f4f0e9913d6a73409ea1fe256a406d3.tar.gz
otp-450e67573f4f0e9913d6a73409ea1fe256a406d3.tar.bz2
otp-450e67573f4f0e9913d6a73409ea1fe256a406d3.zip
Merge branch 'legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112' into maint
* legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112: Remove vestiges of watchdog support in heart
Diffstat (limited to 'lib/sasl')
-rwxr-xr-xlib/sasl/test/release_handler_SUITE_data/start3
-rwxr-xr-xlib/sasl/test/release_handler_SUITE_data/start_client3
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/sasl/test/release_handler_SUITE_data/start b/lib/sasl/test/release_handler_SUITE_data/start
index 87275045b1..eab2b77aed 100755
--- a/lib/sasl/test/release_handler_SUITE_data/start
+++ b/lib/sasl/test/release_handler_SUITE_data/start
@@ -21,8 +21,7 @@ then
fi
HEART_COMMAND=$ROOTDIR/bin/start
-HW_WD_DISABLE=true
-export HW_WD_DISABLE HEART_COMMAND
+export HEART_COMMAND
START_ERL_DATA=${1:-$RELDIR/start_erl.data}
diff --git a/lib/sasl/test/release_handler_SUITE_data/start_client b/lib/sasl/test/release_handler_SUITE_data/start_client
index 5ea94d6f7c..05d744f06e 100755
--- a/lib/sasl/test/release_handler_SUITE_data/start_client
+++ b/lib/sasl/test/release_handler_SUITE_data/start_client
@@ -24,8 +24,7 @@ RELDIR=$CLIENTDIR/releases
# Note that this scripts is modified an copied to $CLIENTDIR/bin/start
# in release_handler_SUITE:copy_client - therefore HEART_COMMAND is as follows:
HEART_COMMAND=$CLIENTDIR/bin/start
-HW_WD_DISABLE=true
-export HW_WD_DISABLE HEART_COMMAND
+export HEART_COMMAND
START_ERL_DATA=${1:-$RELDIR/start_erl.data}