aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-03-18 15:34:58 +0100
committerLukas Larsson <[email protected]>2016-03-18 15:34:58 +0100
commit6a0e1c5664f9d94d2c361a0023e7d25001aaa2e7 (patch)
tree0990e8078eeb25afca53006482dc68e5282d9438
parent47705f668e55bfdb6b578928afdce89f03606d3f (diff)
parenta426da990b999ba8a44aec739e412f7f8722df24 (diff)
downloadotp-6a0e1c5664f9d94d2c361a0023e7d25001aaa2e7.tar.gz
otp-6a0e1c5664f9d94d2c361a0023e7d25001aaa2e7.tar.bz2
otp-6a0e1c5664f9d94d2c361a0023e7d25001aaa2e7.zip
Merge branch 'lukas/erts/scheduler_SUITE_compile_win/OTP-13428'
* lukas/erts/scheduler_SUITE_compile_win/OTP-13428: Fix dirty scheduler tc on windows
-rw-r--r--erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c b/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c
index 022858c114..ab4863337f 100644
--- a/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c
+++ b/erts/emulator/test/scheduler_SUITE_data/scheduler_SUITE.c
@@ -1,4 +1,6 @@
+#ifndef __WIN32__
#include <unistd.h>
+#endif
#include "erl_nif.h"
static int
@@ -15,8 +17,12 @@ static ERL_NIF_TERM
dirty_sleeper(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
{
#ifdef ERL_NIF_DIRTY_SCHEDULER_SUPPORT
+#ifdef __WIN32__
+ Sleep(3000);
+#else
sleep(3);
#endif
+#endif
return enif_make_atom(env, "ok");
}