aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-09-12 20:02:48 +0200
committerSverker Eriksson <[email protected]>2017-09-12 20:02:48 +0200
commitc8cf0eb3af418ee505f6726258cb5d34b14f8867 (patch)
tree6e6812ffa7f00bf08fed04a584cd50689e1efb21 /lib/stdlib
parent4bfca4eed77e53ba1042b2fdc1e63993b44696e1 (diff)
parentf388cb3d4c3c442220b75c9d1626601791fea4bc (diff)
downloadotp-c8cf0eb3af418ee505f6726258cb5d34b14f8867.tar.gz
otp-c8cf0eb3af418ee505f6726258cb5d34b14f8867.tar.bz2
otp-c8cf0eb3af418ee505f6726258cb5d34b14f8867.zip
Merge branch 'sverker/valgrind-fixes/OTP-14609' into maint
* sverker/valgrind-fixes/OTP-14609: erts: Suppress false memory leak for dlerror [ct] Cleanup and rename purify related functions as valgrind Revert "remove unused purify functions" erts: Fix memory leak when sending to terminating port erts: Fix harmless use of uninitialised value
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/test/id_transform_SUITE.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index 3d4ae1a189..186df41d3f 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -61,8 +61,13 @@ id_transform(Config) when is_list(Config) ->
"erl_id_trans.erl"]),
{ok,erl_id_trans,Bin} = compile:file(File,[binary]),
{module,erl_id_trans} = code:load_binary(erl_id_trans, File, Bin),
- ct:timetrap({hours,1}),
- run_in_test_suite().
+ case test_server:is_valgrind() of
+ false ->
+ ct:timetrap({hours,1}),
+ run_in_test_suite();
+ true ->
+ {skip,"Valgrind (too slow)"}
+ end.
run_in_test_suite() ->
SuperDir = filename:dirname(filename:dirname(code:which(?MODULE))),