summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-25 22:00:39 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-25 22:00:39 +0300
commit31de1563a480777460ab303af929464db3f80776 (patch)
tree6c2e37920bfa64291ccabb3b7a737a913f75182c
parent7bbd39e0da04cee932f4afe6a4c85ebb78f39a81 (diff)
downloadManaVerse-31de1563a480777460ab303af929464db3f80776.tar.gz
ManaVerse-31de1563a480777460ab303af929464db3f80776.tar.bz2
ManaVerse-31de1563a480777460ab303af929464db3f80776.tar.xz
ManaVerse-31de1563a480777460ab303af929464db3f80776.zip
Add configure options for build only tests binary with system catch and doctest.
-rwxr-xr-xconfigure.ac20
-rw-r--r--src/Makefile.am7
2 files changed, 26 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 6ac21107e..962dcfc0f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -665,25 +665,43 @@ AC_ARG_ENABLE(unittestsbin,
unittestsbin_enabled=true
unittestsbin_catch=true
unittestsbin_doctest=false
+ unittestsbin_embed=true
;;
catch)
unittestsbin_enabled=true
unittestsbin_catch=true
unittestsbin_doctest=false
+ unittestsbin_embed=true
;;
doctest)
unittestsbin_enabled=true
unittestsbin_catch=false
unittestsbin_doctest=true
+ unittestsbin_embed=true
+ ;;
+ systemcatch)
+ unittestsbin_enabled=true
+ unittestsbin_catch=true
+ unittestsbin_doctest=false
+ unittestsbin_embed=false
+ ;;
+ systemdoctest)
+ unittestsbin_enabled=true
+ unittestsbin_catch=false
+ unittestsbin_doctest=true
+ unittestsbin_embed=false
;;
no)
- unittestsbin_enabled=false ;;
+ unittestsbin_enabled=false
+ unittestsbin_embed=true
+ ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-unittestsbin) ;;
esac],[unittestsbin_enabled=false])
AM_CONDITIONAL(ENABLE_UNITTESTSBIN, test x$unittestsbin_enabled = xtrue)
AM_CONDITIONAL(ENABLE_UNITTESTSBIN_CATCH, test x$unittestsbin_catch = xtrue)
AM_CONDITIONAL(ENABLE_UNITTESTSBIN_DOCTEST, test x$unittestsbin_doctest = xtrue)
+AM_CONDITIONAL(ENABLE_UNITTESTSBIN_EMBED, test x$unittestsbin_embed = xtrue)
# Override home directory for unit tests
AC_ARG_WITH(unittestsdir,
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b7ccd77f..1f31e0f51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,9 +37,16 @@ endif
if ENABLE_UNITTESTSBIN_DOCTEST
manaplustests_CXXFLAGS += -DUNITTESTS_DOCTEST
endif
+if ENABLE_UNITTESTSBIN
+if ENABLE_UNITTESTSBIN_EMBED
+manaplustests_CXXFLAGS += -DUNITTESTS_EMBED
+endif
+endif
+if ENABLE_UNITTESTS
if ENABLE_UNITTESTS_EMBED
manaplustests_CXXFLAGS += -DUNITTESTS_EMBED
endif
+endif
dyecmd_CXXFLAGS = -DPKG_DATADIR=\""$(pkgdatadir)/"\" \
-DLOCALEDIR=\""$(localedir)"\" \