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/src | |
| 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/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 |