aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-02-20 12:44:52 +0100
committerBjörn Gustavsson <[email protected]>2014-02-20 12:44:52 +0100
commit4ba99d6cf384fa9aeb74981312716b275a53fca1 (patch)
treebdbf622248486b8355fcc58cf2d9f4d0595cddfa /lib/tools
parent39c18117df7cb5393fb0164c9aded020941fbddb (diff)
parent04d156de2527b796c6352b1ef138ec59fbcff587 (diff)
downloadotp-4ba99d6cf384fa9aeb74981312716b275a53fca1.tar.gz
otp-4ba99d6cf384fa9aeb74981312716b275a53fca1.tar.bz2
otp-4ba99d6cf384fa9aeb74981312716b275a53fca1.zip
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests: With --enable-native-libs, skip eprof_SUITE:basic_option/1 Speed up bs_construct_SUITE:dynamic/1
Diffstat (limited to 'lib/tools')
-rw-r--r--lib/tools/test/eprof_SUITE.erl8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 26685a6a84..1227d5b841 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -127,6 +127,14 @@ basic(Config) when is_list(Config) ->
ok.
basic_option(Config) when is_list(Config) ->
+ %% Eprof is not supported on native-compile code.
+ case lists:module_info(native_addresses) of
+ [] -> basic_option_1(Config);
+ [_|_] -> {skip,"lists is native-compiled"}
+ end.
+
+basic_option_1(Config) ->
+
%% load eprof_test and change directory
{ok, OldCurDir} = file:get_cwd(),