aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-12-09 14:50:34 +0100
committerMagnus Lidén <[email protected]>2013-12-09 14:50:34 +0100
commitba05ec6dcbf26df15351eae0dc2055c9628b9706 (patch)
tree4ee2839b42ecd2a837b1724b1cf908807b286b45
parenta10f7d4cd2a5a74fb55c9c135c6e9dcbfd2221e0 (diff)
parent652d0d2d784afdb0d42502bdf2831776a0e52ad8 (diff)
downloadotp-ba05ec6dcbf26df15351eae0dc2055c9628b9706.tar.gz
otp-ba05ec6dcbf26df15351eae0dc2055c9628b9706.tar.bz2
otp-ba05ec6dcbf26df15351eae0dc2055c9628b9706.zip
Merge branch 'siri/test-bugfix-upgrade-emulator' into maint
* siri/test-bugfix-upgrade-emulator: [sasl] Test bugfix in branch 'schlagert/fix_emulator_upgrades'
-rwxr-xr-xlib/sasl/test/release_handler_SUITE_data/start2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sasl/test/release_handler_SUITE_data/start b/lib/sasl/test/release_handler_SUITE_data/start
index 45e526c15f..87275045b1 100755
--- a/lib/sasl/test/release_handler_SUITE_data/start
+++ b/lib/sasl/test/release_handler_SUITE_data/start
@@ -26,4 +26,4 @@ export HW_WD_DISABLE HEART_COMMAND
START_ERL_DATA=${1:-$RELDIR/start_erl.data}
-$ROOTDIR/bin/run_erl /tmp/ $ROOTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME" > $ROOTDIR/log/run_erl.out 2>&1 &
+$ROOTDIR/bin/run_erl /tmp/ $ROOTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME -mode embedded" > $ROOTDIR/log/run_erl.out 2>&1 &