aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-03-30 14:13:45 +0200
committerGustav Simonsson <[email protected]>2012-03-30 14:13:50 +0200
commit9fde164b88d5cfda40b2547a3416abdeb3255e48 (patch)
treeaed037bf2792b142f8a356e2415effb07ddd2ea2 /lib
parentf2ea92776a292ff07601e6bbab7663667b50efad (diff)
parent0e47db505096527155e9693f1d1e1014d55770e6 (diff)
downloadotp-9fde164b88d5cfda40b2547a3416abdeb3255e48.tar.gz
otp-9fde164b88d5cfda40b2547a3416abdeb3255e48.tar.bz2
otp-9fde164b88d5cfda40b2547a3416abdeb3255e48.zip
Merge branch 'gustav/sasl/release-handler-test-fix-temp' into maint
* gustav/sasl/release-handler-test-fix-temp: Moved test case to avoid a conflict between test cases. Temporarily fix for R15B01.
Diffstat (limited to 'lib')
-rw-r--r--lib/sasl/test/release_handler_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 467d1226b3..e605a60957 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -59,11 +59,11 @@ win32_cases() ->
cases() ->
[otp_2740, otp_2760, otp_5761, otp_9402, otp_9417,
otp_9395_check_old_code, otp_9395_check_and_purge,
- otp_9395_update_many_mods, otp_9395_rm_many_mods, otp_9864,
+ otp_9395_update_many_mods, otp_9395_rm_many_mods,
instructions, eval_appup, eval_appup_with_restart,
supervisor_which_children_timeout,
release_handler_which_releases, install_release_syntax_check,
- upgrade_supervisor, upgrade_supervisor_fail].
+ upgrade_supervisor, upgrade_supervisor_fail, otp_9864].
groups() ->
[{release,[],