aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/alloc_SUITE_data/threads.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-11-27 12:18:49 +0100
committerSverker Eriksson <[email protected]>2015-11-27 12:18:49 +0100
commit80bbe3b23ad7781e43dfea3a84203956ccab6a10 (patch)
treed038b2b296d373ca55818cdb7b7688f95dbf566f /erts/emulator/test/alloc_SUITE_data/threads.c
parent29f453a3b2af49cd8f2052959262fc3be8971c46 (diff)
parentb916edc72a8eb82068229222abde1b9ff43dbad2 (diff)
downloadotp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.gz
otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.bz2
otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test/alloc_SUITE_data/threads.c')
-rw-r--r--erts/emulator/test/alloc_SUITE_data/threads.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/test/alloc_SUITE_data/threads.c b/erts/emulator/test/alloc_SUITE_data/threads.c
index edad24ee6b..a8a6a23695 100644
--- a/erts/emulator/test/alloc_SUITE_data/threads.c
+++ b/erts/emulator/test/alloc_SUITE_data/threads.c
@@ -86,7 +86,7 @@ static void fail(int t_no, char *frmt, ...)
tc_failed = 1;
- if (erl_drv_getenv("ERL_ABORT_ON_FAILURE", buf, &bufsz) == 0
+ if (enif_getenv("ERL_ABORT_ON_FAILURE", buf, &bufsz) == 0
&& strcmp("true", buf) == 0) {
fprintf(stderr, "Testcase \"%s\" failed: %s\n",
testcase_name(), err_buf);
@@ -187,7 +187,6 @@ testcase_run(TestCaseState_t *tcs)
for(i = 1; i <= NO_OF_THREADS; i++) {
char *alc;
- int res;
threads[i].arg.no_ops_per_bl = NO_OF_OPS_PER_BL;
@@ -446,3 +445,6 @@ thread_func(void *arg)
exit_thread(td->t_no, 1);
return NULL;
}
+
+ERL_NIF_INIT(threads, testcase_nif_funcs, testcase_nif_init,
+ NULL, NULL, NULL);