diff options
| author | Rickard Green <[email protected]> | 2013-06-04 16:26:58 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 16:26:58 +0200 |
| commit | 528c24a93685850b3f54d6c08a975b05b7ede55a (patch) | |
| tree | 384a32a81fe1757b243050038c64d980183940d4 /lib/stdlib | |
| parent | 08fffe14651b07ee5ae04c7bdaa29fee21d65a1e (diff) | |
| parent | b8c941265433e1bdff12c49c611349f6abba1a9e (diff) | |
| download | otp-528c24a93685850b3f54d6c08a975b05b7ede55a.tar.gz otp-528c24a93685850b3f54d6c08a975b05b7ede55a.tar.bz2 otp-528c24a93685850b3f54d6c08a975b05b7ede55a.zip | |
Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maint
* rickard-sverker/carrier-migration/OTP-10279:
stdlib: Fix ets_SUITE memory tests
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index 7550503376..2b29566942 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -5626,16 +5626,25 @@ etsmem() -> MemInfo -> CS = lists:foldl( fun ({instance, _, L}, Acc) -> - {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L), - {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L), - [MBCS,SBCS | Acc] + {value,{mbcs,MBCS}} = lists:keysearch(mbcs, 1, L), + {value,{sbcs,SBCS}} = lists:keysearch(sbcs, 1, L), + NewAcc = [MBCS, SBCS | Acc], + case lists:keysearch(mbcs_pool, 1, L) of + {value,{mbcs_pool, MBCS_POOL}} -> + [MBCS_POOL|NewAcc]; + _ -> NewAcc + end end, [], MemInfo), lists:foldl( fun(L, {Bl0,BlSz0}) -> - {value,{_,Bl,_,_}} = lists:keysearch(blocks, 1, L), - {value,{_,BlSz,_,_}} = lists:keysearch(blocks_size, 1, L), + {value,BlTup} = lists:keysearch(blocks, 1, L), + blocks = element(1, BlTup), + Bl = element(2, BlTup), + {value,BlSzTup} = lists:keysearch(blocks_size, 1, L), + blocks_size = element(1, BlSzTup), + BlSz = element(2, BlSzTup), {Bl0+Bl,BlSz0+BlSz} end, {0,0}, CS) end}, |