Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification

This commit is contained in:
Kaveh Vahedipour 2016-01-21 15:45:40 +01:00
parent 5662bf012e 594f48c630
commit 7f86efa003
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/DocuBlocks/Rest/Documents/REST_DOCUMENT_CREATE.md
View File

@ -71,6 +71,12 @@
/// is returned if the collection specified by *collection* is unknown. The
/// response body contains an error document in this case.
///
/// @RESTRETURNCODE{409}
/// is returned if a document with the same qualifiers in
/// an indexed attribute conflicts with an already existing document
/// and thus violating that uniq constraint.
/// The response body contains an error document in this case.
///
/// @EXAMPLES
///
/// Create a document in a collection named *products*. Note that the
@ -180,4 +186,4 @@
/// logJsonResponse(response);
/// @END_EXAMPLE_ARANGOSH_RUN
/// @endDocuBlock
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////

4
UnitTests/Makefile.unittests
View File

@ -340,7 +340,7 @@ unittests-config:
.PHONY: unittests-boost
if ENABLE_MAINTAINER_MODE
if ENABLE_BOOST_TESTS
unittests-boost: UnitTests/basics_suite UnitTests/geo_suite
@echo
@ -420,7 +420,7 @@ unittests-boost:
@echo "================================================================================"
@echo
@echo "to enable boost unit-tests, install Boost test and configure with --enable-maintainer-mode"
@echo "to enable boost unit-tests, install Boost test and configure with --enable-boost-tests"
@echo
endif

10
configure.ac
View File

@ -422,13 +422,21 @@ dnl ----------------------------------------------------------------------------
BOOST_VERSION="1.58.0"
BOOST_CPPFLAGS="-I${srcdir}/3rdParty/boost/${BOOST_VERSION}"
AC_ARG_ENABLE(boost-tests,
AS_HELP_STRING([--enable-boost-tests], [generate the unittests based on boost (default: $USE_MAINTAINER_MODE)]),
[tr_BOOST_TESTS="${enableval:-yes}"],
[tr_BOOST_TESTS="$USE_MAINTAINER_MODE"]
)
AM_CONDITIONAL(ENABLE_BOOST_TESTS, test "x$tr_BOOST_TESTS" = xyes)
AC_SUBST(BOOST_VERSION)
AC_SUBST(BOOST_CPPFLAGS)
LIB_INFO="$LIB_INFO|BOOST: 3rdParty version"
LIB_INFO="$LIB_INFO|BOOST VERSION: ${BOOST_VERSION}"
LIB_INFO="$LIB_INFO|BOOST_CPPFLAGS: ${BOOST_CPPFLAGS}"
LIB_INFO="$LIB_INFO|BOOST_TESTS: ${tr_BOOST_TESTS}"
LIB_INFO="$LIB_INFO|."
dnl ----------------------------------------------------------------------------