aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-11-25 19:34:29 +0100
committerSverker Eriksson <[email protected]>2016-11-25 19:34:29 +0100
commitece2fe5158d8a3212f5063572150ca991a66464c (patch)
tree4af8f2aef0aed52528f1c13804408483037239b1
parent99900a1e23adb08980c32e09846c281b698d8340 (diff)
downloadotp-ece2fe5158d8a3212f5063572150ca991a66464c.tar.gz
otp-ece2fe5158d8a3212f5063572150ca991a66464c.tar.bz2
otp-ece2fe5158d8a3212f5063572150ca991a66464c.zip
erts: Fix code_SUITE:api_2_0,upgrade crash on win64
-rw-r--r--erts/emulator/test/nif_SUITE.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 01a5e84dc9..0d3910b2e2 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -91,7 +91,13 @@ init_per_group(api_latest, Config) -> Config;
init_per_group(api_2_4, Config) ->
[{nif_api_version, ".2_4"} | Config];
init_per_group(api_2_0, Config) ->
- [{nif_api_version, ".2_0"} | Config].
+ case {os:type(),erlang:system_info({wordsize, internal})} of
+ {{win32,_}, 8} ->
+ %% ERL_NIF_TERM was declared as 32-bit 'long' until 2.3
+ {skip, "API 2.0 buggy on Windows 64-bit"};
+ _ ->
+ [{nif_api_version, ".2_0"} | Config]
+ end.
end_per_group(_,_) -> ok.