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/src | |
| 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/src')
| -rw-r--r-- | lib/common_test/src/ct_config.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl index 30bf5925c0..06a8e12f55 100644 --- a/lib/common_test/src/ct_config.erl +++ b/lib/common_test/src/ct_config.erl @@ -532,7 +532,8 @@ do_require(Name,Key) -> case get_key_from_name(Name) of {error,_} -> allocate(Name,Key); - {ok,Key} -> + {ok,NameKey} when NameKey == Key; + is_tuple(Key) andalso element(1,Key) == NameKey -> %% already allocated - check that it has all required subkeys R = make_ref(), case get_config(Key,R,[]) of |