From 37b62be29639e9d603d65573384eeb0eeb505fb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Tue, 11 May 2010 00:50:54 +0200 Subject: [PATCH] [tests] Move filechooser test files to correct location --- gtk/tests/Makefile.am | 14 +++++++++----- {tests => gtk/tests}/file-chooser-test-dir/empty | 0 .../tests}/file-chooser-test-dir/text.txt | 0 tests/Makefile.am | 4 +--- 4 files changed, 10 insertions(+), 8 deletions(-) rename {tests => gtk/tests}/file-chooser-test-dir/empty (100%) rename {tests => gtk/tests}/file-chooser-test-dir/text.txt (100%) diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index 6b9b3e4f8..86e10585f 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -62,11 +62,10 @@ object_LDADD = $(progs_ldadd) crossingevents_SOURCES = crossingevents.c crossingevents_LDADD = $(progs_ldadd) -# this doesn't work in make distcheck, since it doesn't -# find file-chooser-test-dir -# TEST_PROGS += filechooser -filechooser_SOURCES = filechooser.c pixbuf-init.c -filechooser_LDADD = $(progs_ldadd) +# Should be ported to new API's +#TEST_PROGS += filechooser +#filechooser_SOURCES = filechooser.c pixbuf-init.c +#filechooser_LDADD = $(progs_ldadd) TEST_PROGS += builder builder_SOURCES = builder.c @@ -95,4 +94,9 @@ TEST_PROGS += action action_SOURCES = action.c action_LDADD = $(progs_ldadd) + +EXTRA_DIST += + file-chooser-test-dir/empty \ + file-chooser-test-dir/text.txt + -include $(top_srcdir)/git.mk diff --git a/tests/file-chooser-test-dir/empty b/gtk/tests/file-chooser-test-dir/empty similarity index 100% rename from tests/file-chooser-test-dir/empty rename to gtk/tests/file-chooser-test-dir/empty diff --git a/tests/file-chooser-test-dir/text.txt b/gtk/tests/file-chooser-test-dir/text.txt similarity index 100% rename from tests/file-chooser-test-dir/text.txt rename to gtk/tests/file-chooser-test-dir/text.txt diff --git a/tests/Makefile.am b/tests/Makefile.am index 3083b29a0..4069c079c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -368,9 +368,7 @@ EXTRA_DIST += \ merge-2.ui \ merge-3.ui \ gnome-textfile.png \ - makefile.msc \ - file-chooser-test-dir/empty \ - file-chooser-test-dir/text.txt + makefile.msc -include $(top_srcdir)/git.mk -- 2.43.2