diff options
author | Sverker Eriksson <sverker@erlang.org> | 2016-05-17 17:30:42 +0200 |
---|---|---|
committer | Sverker Eriksson <sverker@erlang.org> | 2016-05-17 17:30:42 +0200 |
commit | 6a8d830deb612e453dee66eabb68f6a7a4d77396 (patch) | |
tree | e2563351435fee346ab773205ea55a060bb259eb /erts/emulator/test | |
parent | 045ab524890d79edd34ee67c8557f578b386adfe (diff) | |
parent | cbee76c388d08100856a92f14850bb3302a51207 (diff) | |
download | otp-6a8d830deb612e453dee66eabb68f6a7a4d77396.tar.gz otp-6a8d830deb612e453dee66eabb68f6a7a4d77396.tar.bz2 otp-6a8d830deb612e453dee66eabb68f6a7a4d77396.zip |
Merge branch 'sverker/hipe-amd64-code-alloc/OTP-13359'
This merge is actually only some left overs.
The bulk work for hipe-amd64-code-alloc has already been
merge (without ticket number) at 42a1166b47721cd444.
Diffstat (limited to 'erts/emulator/test')
-rw-r--r-- | erts/emulator/test/alloc_SUITE.erl | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl index 1f7b499dcb..84cf4921d3 100644 --- a/erts/emulator/test/alloc_SUITE.erl +++ b/erts/emulator/test/alloc_SUITE.erl @@ -73,16 +73,32 @@ migration(Cfg) -> end. erts_mmap(Config) when is_list(Config) -> - case os:type() of - {unix, _} -> + case {os:type(), mmsc_flags()} of + {{unix,_}, false} -> [erts_mmap_do(Config, SCO, SCRPM, SCRFSD) || SCO <-[true,false], SCRFSD <-[1234,0], SCRPM <- [true,false]]; - {SkipOs,_} -> + {{unix,_}, Flags} -> + {skipped, Flags}; + {{SkipOs,_},_} -> {skipped, lists:flatten(["Not run on " | io_lib:format("~p",[SkipOs])])} end. +%% Check if there are ERL_FLAGS set that will mess up this test case +mmsc_flags() -> + case mmsc_flags("ERL_FLAGS") of + false -> mmsc_flags("ERL_ZFLAGS"); + Flags -> Flags + end. +mmsc_flags(Env) -> + case os:getenv(Env) of + false -> false; + V -> case string:str(V, "+MMsc") of + 0 -> false; + P -> Env ++ "=" ++ string:substr(V, P) + end + end. erts_mmap_do(Config, SCO, SCRPM, SCRFSD) -> %% We use the number of schedulers + 1 * approx main carriers size |