summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/tests/Makefile.am14
-rw-r--r--gtk/tests/file-chooser-test-dir/empty (renamed from tests/file-chooser-test-dir/empty)0
-rw-r--r--gtk/tests/file-chooser-test-dir/text.txt (renamed from tests/file-chooser-test-dir/text.txt)0
-rw-r--r--tests/Makefile.am4
4 files changed, 10 insertions, 8 deletions
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 6b9b3e4f85..86e10585f6 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
index e69de29bb2..e69de29bb2 100644
--- a/tests/file-chooser-test-dir/empty
+++ b/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
index cd0875583a..cd0875583a 100644
--- a/tests/file-chooser-test-dir/text.txt
+++ b/gtk/tests/file-chooser-test-dir/text.txt
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3083b29a09..4069c079cb 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