aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-09-12 20:03:16 +0200
committerSverker Eriksson <[email protected]>2017-09-12 20:03:16 +0200
commitef0a90d9ebf0922df027dce904fea989ce138a54 (patch)
treeaa3a7c12d0a7abfcb3ae31be30ac211621875d16 /lib/stdlib
parentcffb99eec48da1afba341808d53a5d3e1c848e28 (diff)
parentc8cf0eb3af418ee505f6726258cb5d34b14f8867 (diff)
downloadotp-ef0a90d9ebf0922df027dce904fea989ce138a54.tar.gz
otp-ef0a90d9ebf0922df027dce904fea989ce138a54.tar.bz2
otp-ef0a90d9ebf0922df027dce904fea989ce138a54.zip
Merge branch 'maint'
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))),