From 10e4f37d31bf1941f2a24cfbed58236833b606c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 9 May 2006 16:15:39 +0000 Subject: [PATCH] Add test infrastructure to gst-ffmpeg (#324279). Original commit message from CVS: * Makefile.am: * configure.ac: * tests/Makefile.am: * tests/check/.cvsignore: * tests/check/Makefile.am: * tests/check/generic/.cvsignore: Add test infrastructure to gst-ffmpeg (#324279). --- ChangeLog | 10 ++++++++++ Makefile.am | 3 ++- common | 2 +- configure.ac | 12 ++++++++++++ tests/Makefile.am | 10 ++++++++++ tests/check/.gitignore | 1 + tests/check/Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++ tests/check/generic/.gitignore | 2 ++ 8 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 tests/Makefile.am create mode 100644 tests/check/.gitignore create mode 100644 tests/check/Makefile.am create mode 100644 tests/check/generic/.gitignore diff --git a/ChangeLog b/ChangeLog index 286eea3..eed8381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-05-09 Tim-Philipp Müller + + * Makefile.am: + * configure.ac: + * tests/Makefile.am: + * tests/check/.cvsignore: + * tests/check/Makefile.am: + * tests/check/generic/.cvsignore: + Add test infrastructure to gst-ffmpeg (#324279). + 2006-05-08 Edward Hervey * autogen.sh: (CONFIGURE_DEF_OPT): diff --git a/Makefile.am b/Makefile.am index fe5f9d3..e37731c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc -SUBDIRS = gst-libs ext docs common +SUBDIRS = gst-libs ext docs common tests + EXTRA_DIST = \ gst-ffmpeg.spec depcomp \ AUTHORS COPYING NEWS README ChangeLog diff --git a/common b/common index 6b67aa6..e41606a 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091 +Subproject commit e41606ab2c6a31be473de511b5fd776bd2593b56 diff --git a/configure.ac b/configure.ac index b0d35d1..4641c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ dnl *** check for arguments to configure *** GST_ARG_WITH_PACKAGE_NAME GST_ARG_WITH_PACKAGE_ORIGIN +GST_ARG_VALGRIND dnl *** checks for platform *** @@ -69,6 +70,9 @@ AC_PROG_CC AM_PROG_CC_STDC AS="${CC}" +AC_PATH_PROG(VALGRIND_PATH, valgrind, no) +AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno") + dnl check for documentation tools GTK_DOC_CHECK([1.3]) AS_PATH_PYTHON([2.1]) @@ -95,6 +99,7 @@ dnl uninstalled is selected preferentially -- see pkg-config(1) GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ]) GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ]) GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GST_REQ]) +GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) dnl *** set variables based on configure arguments *** @@ -144,6 +149,11 @@ dnl whatevertarget_LIBS and -L flags here affect the rest of the linking GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" AC_SUBST(GST_PLUGIN_LDFLAGS) +dnl FIXME: get rid of this by making sure gstreamer-check brings it in +dnl check for "check", unit testing library/header +AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) +AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") + dnl *** configure external libs *** AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1, @@ -164,5 +174,7 @@ docs/version.entities docs/plugins/Makefile common/Makefile common/m4/Makefile +tests/Makefile +tests/check/Makefile ) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..d458f18 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,10 @@ +if HAVE_CHECK +SUBDIRS_CHECK = check +else +SUBDIRS_CHECK = +endif + +SUBDIRS = $(SUBDIRS_CHECK) + +DIST_SUBDIRS = check + diff --git a/tests/check/.gitignore b/tests/check/.gitignore new file mode 100644 index 0000000..5d45c6c --- /dev/null +++ b/tests/check/.gitignore @@ -0,0 +1 @@ +test-registry.xml diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am new file mode 100644 index 0000000..9ec19de --- /dev/null +++ b/tests/check/Makefile.am @@ -0,0 +1,39 @@ +include $(top_srcdir)/common/check.mak + +CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.xml + +REGISTRY_ENVIRONMENT = \ + GST_REGISTRY=$(CHECK_REGISTRY) + +TESTS_ENVIRONMENT = \ + $(REGISTRY_ENVIRONMENT) \ + GST_PLUGIN_SYSTEM_PATH= \ + GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) + +# ths core dumps of some machines have PIDs appended +CLEANFILES = core.* test-registry.xml + +clean-local: clean-local-check + +check_PROGRAMS = +####check_PROGRAMS = \ +#### generic/libavcodec-locking + +VALGRIND_TO_FIX = +####VALGRIND_TO_FIX = \ +#### generic/libavcodec-locking + +TESTS = $(check_PROGRAMS) + +# these tests don't even pass +noinst_PROGRAMS = + +AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) +LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) + +# valgrind testing +VALGRIND_TESTS_DISABLE = $(VALGRIND_TO_FIX) + +SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-ffmpeg.supp + +EXTRA_DIST = gst-ffmpeg.supp diff --git a/tests/check/generic/.gitignore b/tests/check/generic/.gitignore new file mode 100644 index 0000000..36c1981 --- /dev/null +++ b/tests/check/generic/.gitignore @@ -0,0 +1,2 @@ +.dirstamp +libavcodec-locking -- 2.7.4