aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-10-11 10:26:40 +0200
committerLukas Larsson <[email protected]>2012-10-11 10:26:40 +0200
commit9be3f70fb888f9dae778fb10e5a8658526e43583 (patch)
treef37f36884ed748b751bde16cddba00735a9d0c83 /erts/emulator
parent0b7ed35134de2f6a8fe3e3f3fae87c23f71eb391 (diff)
parent1199629eb8c8cb6777df9a284b3e4d20b6df161a (diff)
downloadotp-9be3f70fb888f9dae778fb10e5a8658526e43583.tar.gz
otp-9be3f70fb888f9dae778fb10e5a8658526e43583.tar.bz2
otp-9be3f70fb888f9dae778fb10e5a8658526e43583.zip
Merge branch 'lukas/erts/dont_break_reductions_skip/OTP-10373'
* lukas/erts/dont_break_reductions_skip/OTP-10373: Skip dont_break_reductions on hipe libs tests
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/save_calls_SUITE.erl27
1 files changed, 25 insertions, 2 deletions
diff --git a/erts/emulator/test/save_calls_SUITE.erl b/erts/emulator/test/save_calls_SUITE.erl
index 390b49b604..26ac4f2f7f 100644
--- a/erts/emulator/test/save_calls_SUITE.erl
+++ b/erts/emulator/test/save_calls_SUITE.erl
@@ -21,8 +21,10 @@
-include_lib("test_server/include/test_server.hrl").
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
- init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,
+ init_per_suite/1, end_per_suite/1,
+ init_per_group/2,end_per_group/2,
+ init_per_testcase/2,end_per_testcase/2]).
-export([save_calls_1/1,dont_break_reductions/1]).
@@ -48,6 +50,27 @@ init_per_group(_GroupName, Config) ->
end_per_group(_GroupName, Config) ->
Config.
+init_per_testcase(dont_break_reductions,Config) ->
+ %% Skip on --enable-native-libs as hipe rescedules after each
+ %% function call.
+ case erlang:system_info(hipe_architecture) of
+ undefined ->
+ Config;
+ Architecture ->
+ {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
+ ChunkName = hipe_unified_loader:chunk_name(Architecture),
+ NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
+ case NativeChunk of
+ {ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
+ {skip,"Does not work for --enable-native-libs"};
+ {error, beam_lib, _} -> Config
+ end
+ end;
+init_per_testcase(_,Config) ->
+ Config.
+
+end_per_testcase(_,_Config) ->
+ ok.
dont_break_reductions(suite) ->
[];