1*4882a593SmuzhiyunFrom ae92a466e203c8aec43f682a3a7aa617b820c3ba Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Sergio Prado <sergio.prado@e-labworks.com> 3*4882a593SmuzhiyunDate: Sat, 10 Apr 2021 11:03:38 -0300 4*4882a593SmuzhiyunSubject: [PATCH] Build unit tests only when --enable-unit-tests is passed 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunBuilding unit tests by default requires all dependencies to be 7*4882a593Smuzhiyuninstalled (jpeg, tiff, etc) and users may not want that. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSo let's disable the build of unit tests by default and introduce 10*4882a593Smuzhiyun--enable-unit-tests configure option to enable it. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Sergio Prado <sergio.prado@e-labworks.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun Makefile.am | 8 ++++++-- 15*4882a593Smuzhiyun configure.ac | 4 ++++ 16*4882a593Smuzhiyun 2 files changed, 10 insertions(+), 2 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 19*4882a593Smuzhiyunindex f40bdee0c2e9..152e0d64fdd9 100644 20*4882a593Smuzhiyun--- a/Makefile.am 21*4882a593Smuzhiyun+++ b/Makefile.am 22*4882a593Smuzhiyun@@ -1,7 +1,11 @@ 23*4882a593Smuzhiyun ACLOCAL_AMFLAGS = -I m4 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun-SUBDIRS = src tests 26*4882a593Smuzhiyun-DIST_SUBDIRS = src tests 27*4882a593Smuzhiyun+if BUILD_UNIT_TESTS 28*4882a593Smuzhiyun+SUBDIRS_TESTS = tests 29*4882a593Smuzhiyun+endif 30*4882a593Smuzhiyun+ 31*4882a593Smuzhiyun+SUBDIRS = src $(SUBDIRS_TESTS) 32*4882a593Smuzhiyun+DIST_SUBDIRS = src $(SUBDIRS_TESTS) 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun pkgconfigdir = $(libdir)/pkgconfig 35*4882a593Smuzhiyun 36*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 37*4882a593Smuzhiyunindex 098fd0a664bd..c126ff091e58 100644 38*4882a593Smuzhiyun--- a/configure.ac 39*4882a593Smuzhiyun+++ b/configure.ac 40*4882a593Smuzhiyun@@ -39,6 +39,10 @@ if test $warnaserror = "yes"; then 41*4882a593Smuzhiyun GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered -Wno-typedef-redefinition" 42*4882a593Smuzhiyun fi 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun+AC_ARG_ENABLE(unittests, AS_HELP_STRING([--enable-unittests],[Enable building unit tests.]),[unittests=yes],[unittests=no]) 45*4882a593Smuzhiyun+ 46*4882a593Smuzhiyun+AM_CONDITIONAL([BUILD_UNIT_TESTS], [test x$unittests = xyes]) 47*4882a593Smuzhiyun+ 48*4882a593Smuzhiyun AC_ARG_ENABLE(asan, AS_HELP_STRING([--enable-asan],[Enable address sanitizer.]),[asan=yes],[asan=no]) 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun if test $asan = "yes"; then 51*4882a593Smuzhiyun-- 52*4882a593Smuzhiyun2.17.1 53*4882a593Smuzhiyun 54