check/: Use a cmdline define to specify the location of a file to use for testing...

Original commit message from CVS:
* check/Makefile.am:
* check/elements/fdsrc.c: (GST_START_TEST):
Use a cmdline define to specify the location of a file to use for
testing, to avoid breaking distcheck.

diff --git a/ChangeLog b/ChangeLog
index 3e48577625cbe2cd85a8c6fb862474a8afc9fc88..21b38a0b4376fa3b667f5be9a1f52022e8ccd81d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-28  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * check/Makefile.am:
+       * check/elements/fdsrc.c: (GST_START_TEST):
+       Use a cmdline define to specify the location of a file to use for
+       testing, to avoid breaking distcheck.
+
 2005-11-28  Andy Wingo  <wingo@pobox.com>
 
        * gst/gstpad.c (fixate_value): Use array functions for arrays.

diff --git a/check/Makefile.am b/check/Makefile.am
index ec0930a9f51c6b1b44d5457e91cb23b5eea80011..dd11510b8cc1d78ba115c51f96a51de30edbb3d1 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -76,6 +76,8 @@ gst_libs_gdp_SOURCES = \
        $(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
 gst_libs_gdp_CFLAGS = $(AM_CFLAGS)
 
+elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_builddir)/configure.ac\"
+
 gst_libs_controller_LDADD = \
        $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
        $(LDADD)

diff --git a/check/elements/fdsrc.c b/check/elements/fdsrc.c
index 65e1b9f3f8b1a194113c8aaf67ee7af36d46b3c6..ef748fc96f7cc3e9c3f2c939beeeb685e21ecb97 100644 (file)
--- a/check/elements/fdsrc.c
+++ b/check/elements/fdsrc.c
@@ -150,7 +150,10 @@ GST_START_TEST (test_seeking)
   GstQuery *seeking_query;
   gboolean seekable;
 
-  fail_if ((in_fd = open ("elements/fdsrc.c", O_RDONLY)) < 0);
+#ifndef TESTFILE
+#error TESTFILE not defined
+#endif
+  fail_if ((in_fd = open (TESTFILE, O_RDONLY)) < 0);
   src = setup_fdsrc ();
 
   g_object_set (G_OBJECT (src), "fd", in_fd, NULL);

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index ec0930a9f51c6b1b44d5457e91cb23b5eea80011..dd11510b8cc1d78ba115c51f96a51de30edbb3d1 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -76,6 +76,8 @@ gst_libs_gdp_SOURCES = \
        $(top_srcdir)/libs/gst/dataprotocol/dataprotocol.c
 gst_libs_gdp_CFLAGS = $(AM_CFLAGS)
 
+elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(CHECK_CFLAGS) -DTESTFILE=\"$(top_builddir)/configure.ac\"
+
 gst_libs_controller_LDADD = \
        $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
        $(LDADD)

diff --git a/tests/check/elements/fdsrc.c b/tests/check/elements/fdsrc.c
index 65e1b9f3f8b1a194113c8aaf67ee7af36d46b3c6..ef748fc96f7cc3e9c3f2c939beeeb685e21ecb97 100644 (file)
--- a/tests/check/elements/fdsrc.c
+++ b/tests/check/elements/fdsrc.c
@@ -150,7 +150,10 @@ GST_START_TEST (test_seeking)
   GstQuery *seeking_query;
   gboolean seekable;
 
-  fail_if ((in_fd = open ("elements/fdsrc.c", O_RDONLY)) < 0);
+#ifndef TESTFILE
+#error TESTFILE not defined
+#endif
+  fail_if ((in_fd = open (TESTFILE, O_RDONLY)) < 0);
   src = setup_fdsrc ();
 
   g_object_set (G_OBJECT (src), "fd", in_fd, NULL);