Skip to content

Commit dc85568

Browse files
author
timlinux
committed
Make building of unit tests conditional (disabled by default)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5300 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bf7611f commit dc85568

File tree

5 files changed

+261
-126
lines changed

5 files changed

+261
-126
lines changed

Makefile.am

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
3030

3131
docdata_DATA = AUTHORS
3232

33+
if WITH_UNITTESTS
34+
TESTS = tests
35+
endif
36+
37+
3338
if HAVE_QT4
34-
SUBDIRS = src doc tools i18n resources images tests
39+
SUBDIRS = src doc tools i18n resources images $(TESTS)
3540
endif
3641

3742
pkginclude_HEADERS = qgsconfig.h

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ then
5252
--with-qtdir=$QTDIR \
5353
--with-grass=/usr/lib/grass && make && make install
5454

55+
#--enable-unittests \

configure.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,15 +381,15 @@ fi
381381
AM_CONDITIONAL([HAVE_EXPAT], [test "$have_expat_lib" = "yes"])
382382

383383
dnl ---------------------------------------------------------------------------
384-
dnl Community registration plugin
384+
dnl unittests
385385
dnl ---------------------------------------------------------------------------
386-
AC_ARG_ENABLE(community,
387-
AC_HELP_STRING([--enable-community],
388-
[Enable the community registration plugin (broken!)]),
386+
AC_ARG_ENABLE(unittests,
387+
AC_HELP_STRING([--enable-unittests],
388+
[Enable the compilation of unittests]),
389389
[ac_com=yes], [ac_com=no])
390-
AC_MSG_CHECKING([community registration plugin should be installed (broken)])
390+
AC_MSG_CHECKING([Whether to build unit tests])
391391
AC_MSG_RESULT([$ac_com])
392-
AM_CONDITIONAL([WITH_COMMUNITY], [test "$ac_com" = "yes"])
392+
AM_CONDITIONAL([WITH_UNITTESTS], [test "$ac_com" = "yes"])
393393

394394

395395
dnl ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)