Józef Kucia : build: Add option to disable tests.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 0bbf92404dc16da8d0c8dd32789e90eecfcd09db
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=0bbf92404dc16da8d0c8dd32...

Author: Józef Kucia 
Date:   Thu Jan 31 11:29:31 2019 +0100

build: Add option to disable tests.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

Makefile.am  |  4 +++-
 configure.ac | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e0b31a6..3e9ddea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,12 +137,14 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
 vkd3d_compiler_LDADD = libvkd3d-shader.la

LDADD = libvkd3d.la libvkd3d-utils.la
-check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
 AM_DEFAULT_SOURCE_EXT = .c
+if BUILD_TESTS
+check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
 TESTS = $(vkd3d_tests) $(vkd3d_cross_tests)
 tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@
 tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@
 tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
+endif

if BUILD_DEMOS
 DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@
diff --git a/configure.ac b/configure.ac
index e539d98..37e1edd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,12 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler])
 AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)]))
 AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools],
                                           [Build with SPIRV-Tools library (default: disabled)]))
-AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]))
+AC_ARG_ENABLE([demos],
+              AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),,
+              [enable_demos=no])
+AC_ARG_ENABLE([tests],
+              AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),,
+              [enable_tests=yes])

AC_USE_SYSTEM_EXTENSIONS

@@ -107,10 +112,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_
 VKD3D_CHECK_PTHREAD_SETNAME_NP

dnl Makefiles
-AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no])
 AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
       [AC_MSG_ERROR([libxcb is required for demos.])])
 AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"])
+AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"])
 AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"])
 AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
 AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
@@ -129,6 +134,7 @@ AS_ECHO(["
   Have SPIRV-Tools: ${with_spirv_tools}

Building demos: ${enable_demos}
+  Building tests: ${enable_tests}

Building crosstests: ${HAVE_CROSSTEST}"])
 AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])