2011-05-23 Ivan Maidanski <ivmai@mail.ru>

	* tests/threadkey_test.c (SKIP_THREADKEY_TEST): Skip the test if
	defined; explicitly define for some targets.

diff --git a/ChangeLog b/ChangeLog
index c49fc468d19cb4af6bb28e8de025b2f7075fba69..6ff981ad17404bf5ff818ed59bc50736dfc30354 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+2011-05-23  Ivan Maidanski  <ivmai@mail.ru>
+
+       * tests/threadkey_test.c (SKIP_THREADKEY_TEST): Skip the test if
+       defined; explicitly define for some targets.
+
 2011-05-23  Ivan Maidanski  <ivmai@mail.ru>
 
        * mark.c (GC_dirty): Add prototype (only if MANUAL_VDB).
        * stubborn.c (GC_dirty): Ditto.
        * include/private/gcconfig.h (GWW_VDB, MPROTECT_VDB, PCR_VDB,
-        PROC_VDB): Undefine if MANUAL_VDB.
+       PROC_VDB): Undefine if MANUAL_VDB.
        * include/private/gcconfig.h (DEFAULT_VDB): Don't define if
        MANUAL_VDB.
        * os_dep.c (async_set_pht_entry_from_index): Define for
@@ -23,7 +28,7 @@
        (for PROC_VDB only); print errors via GC_err_printf; rename "ps"
        and "np" local variables to npages and pagesize, respectively;
        remove "current_addr" local variable.
-       * os_dep.c: Refprmat comments.
+       * os_dep.c: Reformat comments.
 
 2011-05-22  Ivan Maidanski  <ivmai@mail.ru>
 

diff --git a/tests/threadkey_test.c b/tests/threadkey_test.c
index 1ea761d9569d5b49df21e88795ff5eda621d571f..bf3f51ea4c0ae6099ea868bf675e0d7d79de6cbe 100644 (file)
--- a/tests/threadkey_test.c
+++ b/tests/threadkey_test.c
@@ -7,6 +7,23 @@
 
 #include "gc.h"
 
+#if (!defined(GC_PTHREADS) || defined(GC_SOLARIS_THREADS) \
+     || defined(__native_client__)) && !defined(SKIP_THREADKEY_TEST)
+  /* FIXME: Skip this test on Solaris for now.  The test may fail on    */
+  /* other targets as well.  Currently, tested only on Linux, Cygwin    */
+  /* and Darwin.                                                        */
+# define SKIP_THREADKEY_TEST
+#endif
+
+#ifdef SKIP_THREADKEY_TEST
+
+int main (void)
+{
+  return 0;
+}
+
+#else
+
 #include <pthread.h>
 
 pthread_key_t key;
@@ -68,3 +85,5 @@ int main (void)
   }
   return 0;
 }
+
+#endif