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

cosmetics

This commit is contained in:
Frank Celler 2012-04-24 14:37:53 +02:00
parent d401aaff7d
commit 2baeeddb9d
4 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@ -2924,7 +2924,7 @@ unittests-verbose:
start-server:
@echo
@echo "================================================================================"
@echo "|| STARTING SERVER ||"
@echo "<< STARTING SERVER >>"
@echo "================================================================================"
@echo
@ -2951,7 +2951,7 @@ start-server:
@ENABLE_BOOST_TEST_TRUE@unittests-boost:
@ENABLE_BOOST_TEST_TRUE@ @echo
@ENABLE_BOOST_TEST_TRUE@ @echo "================================================================================"
@ENABLE_BOOST_TEST_TRUE@ @echo "|| BOOST TESTS ||"
@ENABLE_BOOST_TEST_TRUE@ @echo "<< BOOST TESTS >>"
@ENABLE_BOOST_TEST_TRUE@ @echo "================================================================================"
@ENABLE_BOOST_TEST_TRUE@ @echo
@ -2964,7 +2964,7 @@ start-server:
@ENABLE_BOOST_TEST_FALSE@unittests-boost:
@ENABLE_BOOST_TEST_FALSE@ @echo
@ENABLE_BOOST_TEST_FALSE@ @echo "================================================================================"
@ENABLE_BOOST_TEST_FALSE@ @echo "|| BOOST TESTS ||"
@ENABLE_BOOST_TEST_FALSE@ @echo "<< BOOST TESTS >>"
@ENABLE_BOOST_TEST_FALSE@ @echo "================================================================================"
@ENABLE_BOOST_TEST_FALSE@ @echo
@ -2977,7 +2977,7 @@ start-server:
unittests-shell-server:
@echo
@echo "================================================================================"
@echo "|| SHELL SERVER TESTS (BASCIS) ||"
@echo "<< SHELL SERVER TESTS (BASCIS) >>"
@echo "================================================================================"
@echo
@ -2995,7 +2995,7 @@ unittests-shell-server:
unittests-shell-server-ahuacatl:
@echo
@echo "================================================================================"
@echo "|| SHELL SERVER TESTS (AHUACATL) ||"
@echo "<< SHELL SERVER TESTS (AHUACATL) >>"
@echo "================================================================================"
@echo
@ -3013,7 +3013,7 @@ unittests-shell-server-ahuacatl:
unittests-shell-server-index:
@echo
@echo "================================================================================"
@echo "|| SHELL SERVER TESTS (INDEX & QUERY) ||"
@echo "<< SHELL SERVER TESTS (INDEX & QUERY) >>"
@echo "================================================================================"
@echo
@ -3033,7 +3033,7 @@ unittests-shell-client:
@echo
@echo "================================================================================"
@echo "|| SHELL CLIENT TESTS ||"
@echo "<< SHELL CLIENT TESTS >>"
@echo "================================================================================"
@echo
@ -3056,7 +3056,7 @@ unittests-http-server:
@echo
@echo "================================================================================"
@echo "|| HTTP SERVER TESTS ||"
@echo "<< HTTP SERVER TESTS >>"
@echo "================================================================================"
@echo

16
Makefile.unittests
View File

@ -52,7 +52,7 @@ CLIENT_OPT := --startup.directory ./js --startup.modules-path ./js/client/module
start-server:
@echo
@echo "================================================================================"
@echo "|| STARTING SERVER ||"
@echo "<< STARTING SERVER >>"
@echo "================================================================================"
@echo
@ -82,7 +82,7 @@ if ENABLE_BOOST_TEST
unittests-boost:
@echo
@echo "================================================================================"
@echo "|| BOOST TESTS ||"
@echo "<< BOOST TESTS >>"
@echo "================================================================================"
@echo
@ -112,7 +112,7 @@ else
unittests-boost:
@echo
@echo "================================================================================"
@echo "|| BOOST TESTS ||"
@echo "<< BOOST TESTS >>"
@echo "================================================================================"
@echo
@ -136,7 +136,7 @@ UNITTESTS_SERVER = $(addprefix --unit-tests ,$(SHELL_SERVER))
unittests-shell-server:
@echo
@echo "================================================================================"
@echo "|| SHELL SERVER TESTS (BASCIS) ||"
@echo "<< SHELL SERVER TESTS (BASCIS) >>"
@echo "================================================================================"
@echo
@ -164,7 +164,7 @@ UNITTESTS_SERVER_AHUACATL = $(addprefix --unit-tests ,$(SHELL_SERVER_AHUACATL))
unittests-shell-server-ahuacatl:
@echo
@echo "================================================================================"
@echo "|| SHELL SERVER TESTS (AHUACATL) ||"
@echo "<< SHELL SERVER TESTS (AHUACATL) >>"
@echo "================================================================================"
@echo
@ -197,7 +197,7 @@ UNITTESTS_SERVER_INDEX = $(addprefix --unit-tests ,$(SHELL_SERVER_INDEX))
unittests-shell-server-index:
@echo
@echo "================================================================================"
@echo "|| SHELL SERVER TESTS (INDEX & QUERY) ||"
@echo "<< SHELL SERVER TESTS (INDEX & QUERY) >>"
@echo "================================================================================"
@echo
@ -227,7 +227,7 @@ unittests-shell-client:
@echo
@echo "================================================================================"
@echo "|| SHELL CLIENT TESTS ||"
@echo "<< SHELL CLIENT TESTS >>"
@echo "================================================================================"
@echo
@ -251,7 +251,7 @@ unittests-http-server:
@echo
@echo "================================================================================"
@echo "|| HTTP SERVER TESTS ||"
@echo "<< HTTP SERVER TESTS >>"
@echo "================================================================================"
@echo

37
build.sh
View File

@ -3,19 +3,18 @@
echo "########################################################"
echo "# build.sh #"
echo "########################################################"
echo
. config/detect_distro.sh
OPTIONS="--disable-dependency-tracking --disable-relative"
PREFIX="--prefix=/usr --sysconfdir=/etc"
RESULTS="avocado avocsh"
RESULTS="avocado avocsh avocirb"
export CPPFLAGS=""
export LDFLAGS=""
export MAKEJ=2
export LDD_INFO="no"
export VALGRIND_TEST="no"
export RSPEC_AVAILABLE="yes"
echo
echo "########################################################"
@ -34,7 +33,6 @@ case $TRI_OS_LONG in
Linux-openSUSE-11*)
echo "Using configuration for openSuSE 11"
OPTIONS="$OPTIONS --enable-all-in-one"
VALGRIND_TEST="yes"
LDD_INFO="yes"
;;
@ -48,14 +46,12 @@ case $TRI_OS_LONG in
echo "Using configuration for Debian"
OPTIONS="$OPTIONS --enable-all-in-one"
LDD_INFO="yes"
RSPEC_AVAILABLE="no"
;;
Linux-CentOS-*)
echo "Using configuration for Centos"
OPTIONS="$OPTIONS --enable-all-in-one"
LDD_INFO="yes"
RSPEC_AVAILABLE="no"
;;
Linux-Ubuntu-11.10*)
@ -123,32 +119,3 @@ for result in $RESULTS; do
echo
fi
done
echo
echo
echo "########################################################"
echo "unittests:"
echo " make unittests"
echo "########################################################"
echo
make unittests-boost || exit 1
make unittests-shell-server || exit 1
if text "x$RSPEC_AVAILABLE" = "xyes"; then
make unittests-http-server || exit 1
fi
make unittests-shell-client || exit 1
if test "x$VALGRIND_TEST" = "xyes"; then
echo
echo "########################################################"
echo "unittests with VALGRIND:"
echo " make unittests VALGRIND=valgrind --leak-check=full"
echo "########################################################"
echo
make unittests VALGRIND="valgrind --leak-check=full" || exit 1
fi

1
config/detect_distro.sh
View File

@ -4,6 +4,7 @@
echo "........................................................"
echo ". Detect OS and Distribution ."
echo "........................................................"
echo
OS=`uname -s`
REV=`uname -r`