From: Matthias Clasen Date: Mon, 6 Jul 2009 02:49:24 +0000 (-0400) Subject: Revert "Move gio tests from gio/tests/ to tests/gio/" X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5694ab7642c9ba6fbb85424e71d1c42c17661dd1;p=dana%2Fcg-glib.git Revert "Move gio tests from gio/tests/ to tests/gio/" This reverts commit 2262d76b33094304ece0d0d9cd5920682599a49b. Move GIO tests back to where they belong. --- diff --git a/configure.in b/configure.in index 0987ba00..73e94821 100644 --- a/configure.in +++ b/configure.in @@ -3462,6 +3462,7 @@ gio/libasyncns/Makefile gio/fen/Makefile gio/fam/Makefile gio/win32/Makefile +gio/tests/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile @@ -3472,7 +3473,6 @@ docs/reference/gobject/version.xml docs/reference/gio/Makefile docs/reference/gio/version.xml tests/Makefile -tests/gio/Makefile tests/gobject/Makefile tests/refcount/Makefile m4macros/Makefile diff --git a/gio/Makefile.am b/gio/Makefile.am index 5b8dc623..59d5264b 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -174,6 +174,8 @@ win32_sources = \ endif +SUBDIRS += tests + libgio_2_0_la_SOURCES = \ gappinfo.c \ gasynchelper.c \ diff --git a/tests/gio/.gitignore b/gio/tests/.gitignore similarity index 100% rename from tests/gio/.gitignore rename to gio/tests/.gitignore diff --git a/tests/gio/Makefile.am b/gio/tests/Makefile.am similarity index 100% rename from tests/gio/Makefile.am rename to gio/tests/Makefile.am diff --git a/tests/gio/buffered-input-stream.c b/gio/tests/buffered-input-stream.c similarity index 100% rename from tests/gio/buffered-input-stream.c rename to gio/tests/buffered-input-stream.c diff --git a/tests/gio/contexts.c b/gio/tests/contexts.c similarity index 100% rename from tests/gio/contexts.c rename to gio/tests/contexts.c diff --git a/tests/gio/data-input-stream.c b/gio/tests/data-input-stream.c similarity index 100% rename from tests/gio/data-input-stream.c rename to gio/tests/data-input-stream.c diff --git a/tests/gio/data-output-stream.c b/gio/tests/data-output-stream.c similarity index 100% rename from tests/gio/data-output-stream.c rename to gio/tests/data-output-stream.c diff --git a/tests/gio/desktop-app-info.c b/gio/tests/desktop-app-info.c similarity index 100% rename from tests/gio/desktop-app-info.c rename to gio/tests/desktop-app-info.c diff --git a/tests/gio/echo-server.c b/gio/tests/echo-server.c similarity index 100% rename from tests/gio/echo-server.c rename to gio/tests/echo-server.c diff --git a/tests/gio/filter-streams.c b/gio/tests/filter-streams.c similarity index 100% rename from tests/gio/filter-streams.c rename to gio/tests/filter-streams.c diff --git a/tests/gio/g-file-info.c b/gio/tests/g-file-info.c similarity index 100% rename from tests/gio/g-file-info.c rename to gio/tests/g-file-info.c diff --git a/tests/gio/g-file.c b/gio/tests/g-file.c similarity index 100% rename from tests/gio/g-file.c rename to gio/tests/g-file.c diff --git a/tests/gio/g-icon.c b/gio/tests/g-icon.c similarity index 100% rename from tests/gio/g-icon.c rename to gio/tests/g-icon.c diff --git a/tests/gio/httpd.c b/gio/tests/httpd.c similarity index 100% rename from tests/gio/httpd.c rename to gio/tests/httpd.c diff --git a/tests/gio/live-g-file.c b/gio/tests/live-g-file.c similarity index 100% rename from tests/gio/live-g-file.c rename to gio/tests/live-g-file.c diff --git a/tests/gio/live-g-file.txt b/gio/tests/live-g-file.txt similarity index 100% rename from tests/gio/live-g-file.txt rename to gio/tests/live-g-file.txt diff --git a/tests/gio/memory-input-stream.c b/gio/tests/memory-input-stream.c similarity index 100% rename from tests/gio/memory-input-stream.c rename to gio/tests/memory-input-stream.c diff --git a/tests/gio/memory-output-stream.c b/gio/tests/memory-output-stream.c similarity index 100% rename from tests/gio/memory-output-stream.c rename to gio/tests/memory-output-stream.c diff --git a/tests/gio/readwrite.c b/gio/tests/readwrite.c similarity index 100% rename from tests/gio/readwrite.c rename to gio/tests/readwrite.c diff --git a/tests/gio/resolver.c b/gio/tests/resolver.c similarity index 100% rename from tests/gio/resolver.c rename to gio/tests/resolver.c diff --git a/tests/gio/send-data.c b/gio/tests/send-data.c similarity index 100% rename from tests/gio/send-data.c rename to gio/tests/send-data.c diff --git a/tests/gio/simple-async-result.c b/gio/tests/simple-async-result.c similarity index 100% rename from tests/gio/simple-async-result.c rename to gio/tests/simple-async-result.c diff --git a/tests/gio/sleepy-stream.c b/gio/tests/sleepy-stream.c similarity index 100% rename from tests/gio/sleepy-stream.c rename to gio/tests/sleepy-stream.c diff --git a/tests/gio/socket-client.c b/gio/tests/socket-client.c similarity index 100% rename from tests/gio/socket-client.c rename to gio/tests/socket-client.c diff --git a/tests/gio/socket-server.c b/gio/tests/socket-server.c similarity index 100% rename from tests/gio/socket-server.c rename to gio/tests/socket-server.c diff --git a/tests/gio/srvtarget.c b/gio/tests/srvtarget.c similarity index 100% rename from tests/gio/srvtarget.c rename to gio/tests/srvtarget.c diff --git a/tests/gio/unix-streams.c b/gio/tests/unix-streams.c similarity index 100% rename from tests/gio/unix-streams.c rename to gio/tests/unix-streams.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 162fc4c0..da139764 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -SUBDIRS=gobject refcount gio +SUBDIRS=gobject refcount AM_CPPFLAGS = \ -I$(top_srcdir) \