From fa3625c2413488f3cd2fd63e0c6c2604c56ba224 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Mon, 15 Mar 2004 16:54:28 +0000
Subject: [PATCH] fix registry in testsuite

Original commit message from CVS:
fix registry in testsuite
---
 ChangeLog                              | 8 ++++++++
 tests/old/testsuite/Rules              | 9 ++++++++-
 tests/old/testsuite/plugin/Makefile.am | 2 +-
 testsuite/Rules                        | 9 ++++++++-
 testsuite/plugin/Makefile.am           | 2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7416d0d8d8..3387de47b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* testsuite/Rules:
+          fix gst-register rules
+	* testsuite/plugin/Makefile.am:
+          move gst-register as a test to only plugin, since it's the only
+          one needing it
+
 2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* testsuite/Rules:
diff --git a/tests/old/testsuite/Rules b/tests/old/testsuite/Rules
index dcbeaa8b84..6b230e5f77 100644
--- a/tests/old/testsuite/Rules
+++ b/tests/old/testsuite/Rules
@@ -9,7 +9,14 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 check_PROGRAMS = $(tests_pass) $(tests_fail)
 
-TESTS = $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ $(tests_pass) $(tests_fail)
+# make all tests depend on the versioned gst-register
+$(tests_pass) $(tests_fail): $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@
+
+# rebuild gst-register-@GST_MAJORMINOR@ if needed
+$(top_builddir)/tools/gst-register-@GST_MAJORMINOR@:
+	cd $(top_builddir)/tools && make
+
+TESTS = $(tests_pass) $(tests_fail)
 XFAIL_TESTS = $(tests_fail)
 
 AM_CFLAGS = $(GST_CFLAGS)
diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am
index 9754ce6170..d40b1a0a32 100644
--- a/tests/old/testsuite/plugin/Makefile.am
+++ b/tests/old/testsuite/plugin/Makefile.am
@@ -3,7 +3,7 @@ include ../Rules
 
 plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
-tests_pass = dynamic linked loading registry static static2
+tests_pass = $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ dynamic linked loading registry static static2
 tests_fail =
 
 
diff --git a/testsuite/Rules b/testsuite/Rules
index dcbeaa8b84..6b230e5f77 100644
--- a/testsuite/Rules
+++ b/testsuite/Rules
@@ -9,7 +9,14 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 check_PROGRAMS = $(tests_pass) $(tests_fail)
 
-TESTS = $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ $(tests_pass) $(tests_fail)
+# make all tests depend on the versioned gst-register
+$(tests_pass) $(tests_fail): $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@
+
+# rebuild gst-register-@GST_MAJORMINOR@ if needed
+$(top_builddir)/tools/gst-register-@GST_MAJORMINOR@:
+	cd $(top_builddir)/tools && make
+
+TESTS = $(tests_pass) $(tests_fail)
 XFAIL_TESTS = $(tests_fail)
 
 AM_CFLAGS = $(GST_CFLAGS)
diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am
index 9754ce6170..d40b1a0a32 100644
--- a/testsuite/plugin/Makefile.am
+++ b/testsuite/plugin/Makefile.am
@@ -3,7 +3,7 @@ include ../Rules
 
 plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
-tests_pass = dynamic linked loading registry static static2
+tests_pass = $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ dynamic linked loading registry static static2
 tests_fail =