From 8fd343e4f4393e6eee7d334258b41d56ad04c655 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 22 May 2012 12:25:58 +0200 Subject: [PATCH] generated files --- Makefile.in | 12 ++++++------ Makefile.unittests | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2d7a0b58aa..60476b54cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3064,8 +3064,8 @@ start-server: @ENABLE_BOOST_TEST_TRUE@ @echo "================================================================================" @ENABLE_BOOST_TEST_TRUE@ @echo -@ENABLE_BOOST_TEST_TRUE@ test $(SKIP_BOOST) == "1" || $(VALGRIND) @builddir@/UnitTests/basics_suite --show_progress || test "$(FORCE)" == "1" -@ENABLE_BOOST_TEST_TRUE@ test $(SKIP_GEO) == "1" || $(VALGRIND) @builddir@/UnitTests/geo_suite --show_progress || test "$(FORCE)" == "1" +@ENABLE_BOOST_TEST_TRUE@ test "x$(SKIP_BOOST)" == "x1" || $(VALGRIND) @builddir@/UnitTests/basics_suite --show_progress || test "x$(FORCE)" == "x1" +@ENABLE_BOOST_TEST_TRUE@ test "x$(SKIP_GEO)" == "x1" || $(VALGRIND) @builddir@/UnitTests/geo_suite --show_progress || test "x$(FORCE)" == "x1" @ENABLE_BOOST_TEST_TRUE@ @echo @@ -3094,7 +3094,7 @@ unittests-shell-server: @rm -rf "$(VOCDIR)" @mkdir "$(VOCDIR)" - $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER) || test "$(FORCE)" == "1" + $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER) || test "x$(FORCE)" == "x1" @rm -rf "$(VOCDIR)" @@ -3112,7 +3112,7 @@ unittests-shell-server-ahuacatl: @rm -rf "$(VOCDIR)" @mkdir "$(VOCDIR)" - $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER_AHUACATL) || test "$(FORCE)" == "1" + $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER_AHUACATL) || test "x$(FORCE)" == "x1" @rm -rf "$(VOCDIR)" @@ -3129,7 +3129,7 @@ unittests-shell-client: @echo "================================================================================" @echo - $(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) "$(VOCDIR)" $(UNITTESTS_CLIENT) || test "$(FORCE)" == "1" + $(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) "$(VOCDIR)" $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` while test -f $(PIDFILE); do sleep 1; done @@ -3152,7 +3152,7 @@ unittests-http-server: @echo "================================================================================" @echo - cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ./run-tests || test "$(FORCE)" == "1" + cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ./run-tests || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` while test -f $(PIDFILE); do sleep 1; done diff --git a/Makefile.unittests b/Makefile.unittests index 585bd71836..f4ff5753ee 100644 --- a/Makefile.unittests +++ b/Makefile.unittests @@ -89,8 +89,8 @@ unittests-boost: @echo "================================================================================" @echo - test $(SKIP_BOOST) == "1" || $(VALGRIND) @builddir@/UnitTests/basics_suite --show_progress || test "$(FORCE)" == "1" - test $(SKIP_GEO) == "1" || $(VALGRIND) @builddir@/UnitTests/geo_suite --show_progress || test "$(FORCE)" == "1" + test "x$(SKIP_BOOST)" == "x1" || $(VALGRIND) @builddir@/UnitTests/basics_suite --show_progress || test "x$(FORCE)" == "x1" + test "x$(SKIP_GEO)" == "x1" || $(VALGRIND) @builddir@/UnitTests/geo_suite --show_progress || test "x$(FORCE)" == "x1" @echo @@ -166,7 +166,7 @@ unittests-shell-server: @rm -rf "$(VOCDIR)" @mkdir "$(VOCDIR)" - $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER) || test "$(FORCE)" == "1" + $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER) || test "x$(FORCE)" == "x1" @rm -rf "$(VOCDIR)" @@ -208,7 +208,7 @@ unittests-shell-server-ahuacatl: @rm -rf "$(VOCDIR)" @mkdir "$(VOCDIR)" - $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER_AHUACATL) || test "$(FORCE)" == "1" + $(VALGRIND) @builddir@/arangod "$(VOCDIR)" $(SERVER_OPT) $(UNITTESTS_SERVER_AHUACATL) || test "x$(FORCE)" == "x1" @rm -rf "$(VOCDIR)" @@ -233,7 +233,7 @@ unittests-shell-client: @echo "================================================================================" @echo - $(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) "$(VOCDIR)" $(UNITTESTS_CLIENT) || test "$(FORCE)" == "1" + $(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) "$(VOCDIR)" $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` while test -f $(PIDFILE); do sleep 1; done @@ -257,7 +257,7 @@ unittests-http-server: @echo "================================================================================" @echo - cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ./run-tests || test "$(FORCE)" == "1" + cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ./run-tests || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` while test -f $(PIDFILE); do sleep 1; done