fix registry in testsuite

Original commit message from CVS:
fix registry in testsuite

diff --git a/ChangeLog b/ChangeLog
index 7416d0d8d893186176bea5f94a40d0bf03b6d495..3387de47b7d7434272d4d80c1f4fd620262f76b8 100644 (file)
--- 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 dcbeaa8b84f223bfa61e9fb9abc429aa01dae4c3..6b230e5f7782b30aa3d3f9a6f5f85c4e28a7f009 100644 (file)
--- 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 9754ce61700519d432a2b6080ad1facf5b4072a1..d40b1a0a3235816b08c9b8c8b3dc3aacf58984c9 100644 (file)
--- 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 dcbeaa8b84f223bfa61e9fb9abc429aa01dae4c3..6b230e5f7782b30aa3d3f9a6f5f85c4e28a7f009 100644 (file)
--- 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 9754ce61700519d432a2b6080ad1facf5b4072a1..d40b1a0a3235816b08c9b8c8b3dc3aacf58984c9 100644 (file)
--- 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 =