Skip to content

Add render tools as prerequisite for dilloc tests #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodarima merged 1 commit into from
Apr 8, 2026
Merged

Add render tools as prerequisite for dilloc tests #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,32 +740,42 @@ if test "x$enable_ipv6" = "xyes"; then
AC_DEFINE([ENABLE_IPV6], [1], [Enable IPv6 support])
fi

dnl ----------
dnl HTML tests
dnl ----------
dnl ------------
dnl Render tools
dnl ------------
dnl
html_tests_ok=no
if test "x$enable_html_tests" = "xyes" ; then
html_tests_ok=yes
render_tools_ok=no
if test "x$enable_html_tests" = "xyes" -o "x$enable_control_socket" = "xyes"; then
render_tools_ok=yes
AC_CHECK_PROG(xvfb_ok, Xvfb, yes, no)
AC_CHECK_PROG(xwd_ok, xwd, yes, no)
AC_CHECK_PROG(xwininfo_ok, xwininfo, yes, no)
AC_CHECK_PROG(convert_ok, convert, yes, no)

if test "x$xvfb_ok" != "xyes"; then
html_tests_ok=no
render_tools_ok=no
fi
if test "x$xwd_ok" != "xyes"; then
html_tests_ok=no
render_tools_ok=no
fi
if test "x$xwininfo_ok" != "xyes"; then
html_tests_ok=no
render_tools_ok=no
fi
if test "x$convert_ok" != "xyes"; then
html_tests_ok=no
render_tools_ok=no
fi
if test "x$html_tests_ok" != "xyes"; then
fi

dnl ----------
dnl HTML tests
dnl ----------
dnl
html_tests_ok=no
if test "x$enable_html_tests" = "xyes" ; then
if test "x$render_tools_ok" != "xyes"; then
AC_MSG_ERROR([Cannot find all tools to enable HTML tests])
else
html_tests_ok=yes
fi

dnl Needs control socket
Expand All @@ -781,6 +791,7 @@ dnl --------------
dnl Control socket
dnl --------------
unix_socket_ok=no
enable_dilloc_tests=no
if test "x$enable_control_socket" = "xyes"; then
dnl Check that UNIX sockets are suppported.
AC_MSG_CHECKING([for AF_UNIX socket support])
Expand All @@ -807,10 +818,17 @@ if test "x$enable_control_socket" = "xyes"; then
AC_MSG_RESULT([no])
AC_MSG_FAILURE([AF_UNIX socket test failed, cannot enable control socket])
fi
dnl Needs render tools
if test "x$render_tools_ok" = "xyes"; then
enable_dilloc_tests=yes
else
AC_MSG_WARN([Missing render tools to enable dilloc tests, disabling])
fi
else
AC_MSG_NOTICE([Disabling control socket])
fi
AM_CONDITIONAL([ENABLE_CONTROL_SOCKET], [test "x$enable_control_socket" = "xyes"])
AM_CONDITIONAL([ENABLE_DILLOC_TESTS], [test "x$enable_dilloc_tests" = "xyes"])

dnl --------------------
dnl Command line options
Expand Down Expand Up @@ -952,6 +970,7 @@ _AS_ECHO([Developer options:])
_AS_ECHO([])
_AS_ECHO([ RTFL enabled : ${enable_rtfl}])
_AS_ECHO([ HTML tests : ${html_tests_ok}])
_AS_ECHO([ Dilloc tests : ${enable_dilloc_tests}])
_AS_ECHO([])
_AS_ECHO([Configuration summary:])
_AS_ECHO([])
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if ENABLE_HTML_TESTS
SUBDIRS += html
endif

if ENABLE_CONTROL_SOCKET
if ENABLE_DILLOC_TESTS
SUBDIRS += dilloc
endif

Expand Down
Loading