[glib] gthread: move test cases to glib/

[Ryan Lortie <ryanl src gnome org>]

commit a9a1c97904aeed96bcb248e16cb495e6907b7126
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Oct 16 19:08:59 2011 -0400

    gthread: move test cases to glib/

 configure.ac                                  |    1 -
 {gthread => glib}/tests/1bit-mutex.c          |    0
 {gthread => glib}/tests/642026.c              |    0
 glib/tests/Makefile.am                        |   46 +++++++++++++++++++++-
 {gthread => glib}/tests/gwakeuptest.c         |    0
 {gthread => glib}/tests/spawn-multithreaded.c |    0
 {gthread => glib}/tests/spawn-singlethread.c  |    0
 {gthread => glib}/tests/test-spawn-echo.c     |    0
 gthread/Makefile.am                           |    3 -
 gthread/tests/.gitignore                      |   11 -----
 gthread/tests/Makefile.am                     |   52 -------------------------
 11 files changed, 44 insertions(+), 69 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 63703db..fed8a9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3609,7 +3609,6 @@ gobject/gobject.stp
 gobject/glib-mkenums
 gobject/tests/Makefile
 gthread/Makefile
-gthread/tests/Makefile
 gio/Makefile
 gio/gdbus-2.0/codegen/Makefile
 gio/gdbus-2.0/codegen/config.py
diff --git a/gthread/tests/1bit-mutex.c b/glib/tests/1bit-mutex.c
similarity index 100%
rename from gthread/tests/1bit-mutex.c
rename to glib/tests/1bit-mutex.c
diff --git a/gthread/tests/642026.c b/glib/tests/642026.c
similarity index 100%
rename from gthread/tests/642026.c
rename to glib/tests/642026.c
diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index 6581ded..5d18189 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -6,9 +6,12 @@ INCLUDES = 				\
 	-DSRCDIR=\""$(srcdir)"\"	\
 	$(GLIB_DEBUG_FLAGS)
 
-noinst_PROGRAMS = $(TEST_PROGS)
+noinst_PROGRAMS = $(TEST_PROGS) test-spawn-echo
 progs_ldadd     = $(top_builddir)/glib/libglib-2.0.la 
 
+test_spawn_echo_SOURCES = test-spawn-echo.c
+test_spawn_echo_LDADD = $(progs_ldadd)
+
 TEST_PROGS       += testing
 testing_SOURCES	  = testing.c
 testing_LDADD	  = $(progs_ldadd)
@@ -224,10 +227,49 @@ private_LDADD    = $(progs_ldadd)
 TEST_PROGS       += asyncqueue
 asyncqueue_LDADD  = $(progs_ldadd)
 
-if OS_UNIX
+TEST_PROGS       += 1bit-mutex
+1bit_mutex_LDADD  = $(progs_ldadd)
+
+TEST_PROGS       += 642026
+642026_LDADD      = $(progs_ldadd)
+
+TEST_PROGS       += 642026-ec
+642026_ec_SOURCES = 642026.c
+642026_ec_LDADD   = $(progs_ldadd)
+642026_ec_CFLAGS  = -DG_ERRORCHECK_MUTEXES
+
+TEST_PROGS            += 1bit-emufutex
+1bit_emufutex_SOURCES  = 1bit-mutex.c
+1bit_emufutex_CFLAGS   = -DTEST_EMULATED_FUTEX
+1bit_emufutex_LDADD    = $(progs_ldadd)
+
+TEST_PROGS += spawn-multithreaded
+spawn_multithreaded_SOURCES = spawn-multithreaded.c
+spawn_multithreaded_LDADD    = $(progs_ldadd)
 
+TEST_PROGS += spawn-singlethread
+spawn_singlethread_SOURCES = spawn-singlethread.c
+spawn_singlethread_LDADD    = $(progs_ldadd)
+
+TEST_PROGS += gwakeup
+gwakeup_SOURCES = gwakeuptest.c ../../glib/gwakeup.c
+gwakeup_LDADD    = $(progs_ldadd)
+
+if HAVE_EVENTFD
+TEST_PROGS += gwakeup-fallback
+gwakeup_fallback_SOURCES = gwakeuptest.c ../../glib/gwakeup.c
+gwakeup_fallback_CFLAGS = $(AM_CFLAGS) -DTEST_EVENTFD_FALLBACK
+gwakeup_fallback_LDADD    = $(progs_ldadd)
+endif
+
+if OS_UNIX
 private_LDFLAGS = -pthread
 
+TEST_PROGS += unix-multithreaded
+unix_multithreaded_SOURCES = $(top_srcdir)/glib/tests/unix.c
+unix_multithreaded_CFLAGS   = -DTEST_THREADED
+unix_multithreaded_LDADD    = $(progs_ldadd)
+
 TEST_PROGS    += unix
 unix_LDADD  = $(progs_ldadd)
 
diff --git a/gthread/tests/gwakeuptest.c b/glib/tests/gwakeuptest.c
similarity index 100%
rename from gthread/tests/gwakeuptest.c
rename to glib/tests/gwakeuptest.c
diff --git a/gthread/tests/spawn-multithreaded.c b/glib/tests/spawn-multithreaded.c
similarity index 100%
rename from gthread/tests/spawn-multithreaded.c
rename to glib/tests/spawn-multithreaded.c
diff --git a/gthread/tests/spawn-singlethread.c b/glib/tests/spawn-singlethread.c
similarity index 100%
rename from gthread/tests/spawn-singlethread.c
rename to glib/tests/spawn-singlethread.c
diff --git a/gthread/tests/test-spawn-echo.c b/glib/tests/test-spawn-echo.c
similarity index 100%
rename from gthread/tests/test-spawn-echo.c
rename to glib/tests/test-spawn-echo.c
diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 00e62a5..7ff1c5b 100644
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -1,9 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = . tests
-DIST_SUBDIRS = tests
-
 AM_CPPFLAGS = 				\
 	$(glib_INCLUDES) 		\
 	-DG_LOG_DOMAIN=\"GThread\" 	\