gthread: move test cases to glib/
authorRyan Lortie <desrt@desrt.ca>
Sun, 16 Oct 2011 23:08:59 +0000 (19:08 -0400)
committerRyan Lortie <desrt@desrt.ca>
Sun, 16 Oct 2011 23:08:59 +0000 (19:08 -0400)
configure.ac
glib/tests/1bit-mutex.c [moved from gthread/tests/1bit-mutex.c with 100% similarity]
glib/tests/642026.c [moved from gthread/tests/642026.c with 100% similarity]
glib/tests/Makefile.am
glib/tests/gwakeuptest.c [moved from gthread/tests/gwakeuptest.c with 100% similarity]
glib/tests/spawn-multithreaded.c [moved from gthread/tests/spawn-multithreaded.c with 100% similarity]
glib/tests/spawn-singlethread.c [moved from gthread/tests/spawn-singlethread.c with 100% similarity]
glib/tests/test-spawn-echo.c [moved from gthread/tests/test-spawn-echo.c with 100% similarity]
gthread/Makefile.am
gthread/tests/.gitignore [deleted file]
gthread/tests/Makefile.am [deleted file]

index 63703db..fed8a9a 100644 (file)
@@ -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
similarity index 100%
rename from gthread/tests/642026.c
rename to glib/tests/642026.c
index 6581ded..5d18189 100644 (file)
@@ -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)
 
index 00e62a5..7ff1c5b 100644 (file)
@@ -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\"      \
diff --git a/gthread/tests/.gitignore b/gthread/tests/.gitignore
deleted file mode 100644 (file)
index e4e9995..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-1bit-emufutex
-1bit-mutex
-642026
-642026-ec
-atomic
-gwakeup
-gwakeup-fallback
-spawn-multithreaded
-spawn-singlethread
-test-spawn-echo
-unix-multithreaded
diff --git a/gthread/tests/Makefile.am b/gthread/tests/Makefile.am
deleted file mode 100644 (file)
index 7f2229f..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-INCLUDES = -g $(gthread_INCLUDES) $(GLIB_DEBUG_FLAGS)
-
-noinst_PROGRAMS = $(TEST_PROGS) test-spawn-echo
-progs_ldadd     = $(top_builddir)/glib/libglib-2.0.la \
-                 $(top_builddir)/gthread/libgthread-2.0.la
-
-test_spawn_echo_SOURCES = test-spawn-echo.c
-test_spawn_echo_LDADD = $(progs_ldadd)
-
-TEST_PROGS      += 1bit-mutex
-1bit_mutex_LDADD  = $(progs_ldadd) $(top_builddir)/gthread/libgthread-2.0.la
-
-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) $(top_builddir)/gthread/libgthread-2.0.la
-
-if OS_UNIX
-TEST_PROGS += unix-multithreaded
-unix_multithreaded_SOURCES = $(top_srcdir)/glib/tests/unix.c
-unix_multithreaded_CFLAGS   = -DTEST_THREADED
-unix_multithreaded_LDADD    = $(progs_ldadd) $(top_builddir)/gthread/libgthread-2.0.la
-endif
-
-TEST_PROGS += spawn-multithreaded
-spawn_multithreaded_SOURCES = spawn-multithreaded.c
-spawn_multithreaded_LDADD    = $(progs_ldadd) $(top_builddir)/gthread/libgthread-2.0.la
-
-TEST_PROGS += spawn-singlethread
-spawn_singlethread_SOURCES = spawn-singlethread.c
-spawn_singlethread_LDADD    = $(progs_ldadd) $(top_builddir)/gthread/libgthread-2.0.la
-
-TEST_PROGS += gwakeup
-gwakeup_SOURCES = gwakeuptest.c ../../glib/gwakeup.c
-gwakeup_LDADD    = $(progs_ldadd) $(top_builddir)/gthread/libgthread-2.0.la
-
-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) $(top_builddir)/gthread/libgthread-2.0.la
-endif