diff options
author | Sverker Eriksson <[email protected]> | 2013-06-20 15:06:34 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-06-20 15:06:57 +0200 |
commit | 6898b6285f443e9ad8d01ce17b08bb7991c6ea5f (patch) | |
tree | 00649c7883aa6424a3e7eb18cd864db5636c0a5f /erts/emulator/test/alloc_SUITE_data/coalesce.c | |
parent | 10d93045982fc1477a4dade95d1cc400928fec14 (diff) | |
parent | 8212fdf19997e08a52ff9374283ff5e148561a0c (diff) | |
download | otp-6898b6285f443e9ad8d01ce17b08bb7991c6ea5f.tar.gz otp-6898b6285f443e9ad8d01ce17b08bb7991c6ea5f.tar.bz2 otp-6898b6285f443e9ad8d01ce17b08bb7991c6ea5f.zip |
Merge branch 'sverk/aoffcbf' into maint
* sverk/aoffcbf:
erts: Make aoffcbf default when migration is enabled
erts: Add new allocator strategy aoffcbf
OTP-11174
Diffstat (limited to 'erts/emulator/test/alloc_SUITE_data/coalesce.c')
-rw-r--r-- | erts/emulator/test/alloc_SUITE_data/coalesce.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/alloc_SUITE_data/coalesce.c b/erts/emulator/test/alloc_SUITE_data/coalesce.c index 36710bf7b5..9da49a0d14 100644 --- a/erts/emulator/test/alloc_SUITE_data/coalesce.c +++ b/erts/emulator/test/alloc_SUITE_data/coalesce.c @@ -267,7 +267,7 @@ void testcase_run(TestCaseState_t *tcs) { char *argv_org[] = {"-tsmbcs511","-tmmbcs511", "-tsbct512", "-trmbcmt100", "-tas", NULL, NULL}; - char *alg[] = {"af", "gf", "bf", "aobf", "aoff", "aoffcaobf", NULL}; + char *alg[] = {"af", "gf", "bf", "aobf", "aoff", "aoffcbf", "aoffcaobf", NULL}; int i; for (i = 0; alg[i]; i++) { |