diff options
| author | Lukas Larsson <[email protected]> | 2012-11-09 15:54:26 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-11-09 15:54:26 +0100 |
| commit | 668c4263148fdb346ad2d9cd9fcede7e0c9dad6a (patch) | |
| tree | 8d26d989d4b7b903ae96f4f34c3de279cd3a7ee1 /lib/common_test/test/ct_config_SUITE.erl | |
| parent | 9604cf9378dc240d9be36d3785bfbd9731437f03 (diff) | |
| parent | 22698424dbc6efec84d71234b60290b3937f2f28 (diff) | |
| download | otp-668c4263148fdb346ad2d9cd9fcede7e0c9dad6a.tar.gz otp-668c4263148fdb346ad2d9cd9fcede7e0c9dad6a.tar.bz2 otp-668c4263148fdb346ad2d9cd9fcede7e0c9dad6a.zip | |
Merge branch 'lukas/common_test/multi_require_bug/OTP-10572' into maint
* lukas/common_test/multi_require_bug/OTP-10572:
Fix bug where require of same name at same config would return name in use
Diffstat (limited to 'lib/common_test/test/ct_config_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_config_SUITE.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl index 0b1abae757..1e1df908db 100644 --- a/lib/common_test/test/ct_config_SUITE.erl +++ b/lib/common_test/test/ct_config_SUITE.erl @@ -251,6 +251,7 @@ expected_events(config_static_SUITE)-> ?sok(test_alias_tclocal_nested,{14,0,{2,1}}), ?sok(test_alias_tclocal_nested_backward_compat,{15,0,{2,1}}), ?sok(test_alias_tclocal_nested_backward_compat_subvals,{16,0,{2,1}}), + ?sok(test_config_same_name_already_in_use,{17,0,{2,1}}), {?eh,tc_start,{config_static_SUITE,end_per_suite}}, {?eh,tc_done,{config_static_SUITE,end_per_suite,ok}}, {?eh,test_done,{'DEF','STOP_TIME'}}, |