diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2022-05-06 19:54:29 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2022-06-15 22:41:21 +0300 |
| commit | 9ce4d60f8fd7bf7fa812a1d1e478539500d96511 (patch) | |
| tree | 1addbc155c00a6ff5fa06d2bd28a0fdb100c4df8 /tests | |
| parent | c16a8d2c2fb97ff666a2c7b161066e774861a993 (diff) | |
| download | bdwgc-9ce4d60f8fd7bf7fa812a1d1e478539500d96511.tar.gz | |
Fix incremental mode enabling in gctest if TEST_MANUAL_VDB
(a cherry-pick of commit 53f1a64f1 from 'release-8_2')
Previously, if DEFAULT_VDB was defined in gcconfig.h, then
TEST_MANUAL_VDB had no effect on gctest, practically.
* tests/test.c [(!PCR && !GC_WIN32_THREADS || GC_PTHREADS)
&& TEST_MANUAL_VDB && DEFAULT_VDB && !GC_DISABLE_INCREMENTAL
&& !MAKE_BACK_GRAPH && !NO_INCREMENTAL && !REDIRECT_MALLOC
&& !USE_PROC_FOR_LIBRARIES] (main): Call GC_enable_incremental().
* tests/test.c [(!PCR && !GC_WIN32_THREADS || GC_PTHREADS)
&& TEST_MANUAL_VDB && !GC_DISABLE_INCREMENTAL] (main): Call
GC_is_incremental_mode() and GC_printf().
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test.c b/tests/test.c index 2b3f944e..123da41f 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1897,8 +1897,8 @@ void GC_CALLBACK warn_proc(char *msg, GC_word p) # endif GC_COND_INIT(); GC_set_warn_proc(warn_proc); -# if !defined(GC_DISABLE_INCREMENTAL) \ - && (defined(TEST_DEFAULT_VDB) || !defined(DEFAULT_VDB)) +# if (defined(TEST_DEFAULT_VDB) || defined(TEST_MANUAL_VDB) \ + || !defined(DEFAULT_VDB)) && !defined(GC_DISABLE_INCREMENTAL) # if !defined(MAKE_BACK_GRAPH) && !defined(NO_INCREMENTAL) \ && !(defined(MPROTECT_VDB) && defined(USE_MUNMAP)) GC_enable_incremental(); @@ -2338,8 +2338,8 @@ int main(void) } # endif n_tests = 0; -# if !defined(GC_DISABLE_INCREMENTAL) \ - && (defined(TEST_DEFAULT_VDB) || !defined(DEFAULT_VDB)) +# if (defined(TEST_DEFAULT_VDB) || defined(TEST_MANUAL_VDB) \ + || !defined(DEFAULT_VDB)) && !defined(GC_DISABLE_INCREMENTAL) # if !defined(REDIRECT_MALLOC) && !defined(MAKE_BACK_GRAPH) \ && !defined(USE_PROC_FOR_LIBRARIES) && !defined(NO_INCREMENTAL) \ && !defined(USE_MUNMAP) |