brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/tests: Unconditionally include tests using gdk-pixbuf

Browse Source 
We already have gdk-pixbuf as a dependency, so there is no reason to
make it conditional here.
This commit is contained in:
Jonas Ådahl 2018-07-05 21:24:44 +02:00
parent 0067f78155
commit 14be04a630
2 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
clutter/configure.ac
View File

@ -405,32 +405,11 @@ else
fi fi
fi fi
dnl === Enable GDK-Pixbuf in tests ============================================ dnl === Check for GDK-Pixbuf in tests =========================================
m4_define([pixbuf_default], [yes]) PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0])
AC_ARG_ENABLE([gdk-pixbuf], AC_SUBST(GDK_PIXBUF_CFLAGS)
[AS_HELP_STRING([--enable-gdk-pixbuf=@<:@no/yes@:>@], AC_SUBST(GDK_PIXBUF_LIBS)
[Enable tests using GDK-Pixbuf @<:@default=]pixbuf_default[@:>@])],
[enable_pixbuf=$enable_val],
[enable_pixbuf=pixbuf_default])
AS_CASE([$enable_pixbuf],
[yes],
[
PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0])
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
pixbuf_tests=yes
],
[no],
[
pixbuf_tests=no
]
)
AM_CONDITIONAL([PIXBUF_TESTS], [test "x$pixbuf_tests" = "xyes"])
dnl === Enable debug level ==================================================== dnl === Enable debug level ====================================================

8
clutter/tests/interactive/Makefile.am
View File

@ -44,17 +44,13 @@ UNIT_TESTS = \
test-keyframe-transition.c \ test-keyframe-transition.c \
test-bind-constraint.c \ test-bind-constraint.c \
test-touch-events.c \ test-touch-events.c \
test-rotate-zoom.c test-rotate-zoom.c \
test-image.c
if X11_TESTS if X11_TESTS
UNIT_TESTS += test-pixmap.c UNIT_TESTS += test-pixmap.c
endif endif
if PIXBUF_TESTS
UNIT_TESTS += \
test-image.c
endif
SHEXT = $(EXEEXT) SHEXT = $(EXEEXT)
# For convenience, this provides a way to easily run individual unit tests: # For convenience, this provides a way to easily run individual unit tests: