2009-12-10 Hans-J. Boehm <Hans.Boehm@hp.com>

	* test.c (main, WinMain): Consistently don't invoke
	GC_enable_incremental() if MAKE_BACKGRAPH is defined, but
	do invoke it even if parallel marking is enabled.

diff --git a/ChangeLog b/ChangeLog
index f6091d4855bc940c319dbae9059ff5aba3039490..e377b6677a8cdcae0a00da6927d39aea8cd60ca6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-10  Hans-J. Boehm <Hans.Boehm@hp.com>
+
+       * test.c (main, WinMain): Consistently don't invoke
+       GC_enable_incremental() if MAKE_BACKGRAPH is defined, but
+       do invoke it even if parallel marking is enabled.
+
 2009-12-08  Ivan Maidanski <ivmai@mail.ru>
 
        * tests/test.c (reverse_test): Comment out a check for MSWIN32

diff --git a/tests/test.c b/tests/test.c
index fad6d5a9190b6c9d0c4a49d7d9a33dfc8a8b6ba2..c78c1190268c63266c4243981ac46c85ef83575c 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1532,7 +1532,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prev,
     GC_printf("Using DllMain to track threads\n");
 # endif
   GC_COND_INIT();
-# ifndef NO_INCREMENTAL
+# if !defined(MAKE_BACK_GRAPH) && !defined(NO_INCREMENTAL)
     GC_enable_incremental();
 # endif
   InitializeCriticalSection(&incr_cs);
@@ -1650,8 +1650,7 @@ int main(void)
         pthread_attr_setstacksize(&attr, 1000000);
 #   endif
     n_tests = 0;
-#   if (defined(MPROTECT_VDB)) \
-            && !defined(PARALLEL_MARK) &&!defined(REDIRECT_MALLOC) \
+#   if (defined(MPROTECT_VDB)) && !defined(REDIRECT_MALLOC) \
             && !defined(MAKE_BACK_GRAPH) && !defined(USE_PROC_FOR_LIBRARIES) \
             && !defined(NO_INCREMENTAL)
         GC_enable_incremental();