diff options
| author | Lukas Larsson <[email protected]> | 2012-11-09 15:54:40 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-11-09 15:54:40 +0100 |
| commit | 6863e56e5ce5705e690c672c697e6eb48607caea (patch) | |
| tree | 632c8af12ebe442ab61668465443c507be942344 /lib/common_test/test/ct_config_SUITE.erl | |
| parent | c420f4a70f373b742a6a10db9352d0f3f0d4f3de (diff) | |
| parent | 668c4263148fdb346ad2d9cd9fcede7e0c9dad6a (diff) | |
| download | otp-6863e56e5ce5705e690c672c697e6eb48607caea.tar.gz otp-6863e56e5ce5705e690c672c697e6eb48607caea.tar.bz2 otp-6863e56e5ce5705e690c672c697e6eb48607caea.zip | |
Merge branch 'maint'
* maint:
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'}}, |