From c293ee72f72fe08d929e16da40b0bbb3383c0579 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 14 Aug 2012 11:55:48 +0200 Subject: [PATCH] fixed wrong maximal journal size --- Makefile.in | 2 +- Makefile.unittests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0bba8e7b38..dd94ab377e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1622,6 +1622,7 @@ CERT_FILE := @srcdir@/UnitTests/server.pem ################################################################################ SHELL_COMMON = @srcdir@/js/common/tests/shell-document.js \ @srcdir@/js/common/tests/shell-edge.js \ + @srcdir@/js/common/tests/shell-compactor.js \ @srcdir@/js/common/tests/shell-collection.js \ @srcdir@/js/common/tests/shell-simple-query.js \ @srcdir@/js/common/tests/shell-index.js \ @@ -5552,7 +5553,6 @@ Doxygen/js/server/modules/%.c: @srcdir@/js/server/modules/%.js Doxygen/.setup-di @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ Doxygen/xml/%.md: Doxygen/xml/%.xml - echo "CREATING XML FROM MD!!!" @python @top_srcdir@/Doxygen/Scripts/xml2md.py $< > $@ ################################################################################ diff --git a/Makefile.unittests b/Makefile.unittests index 7de6d29c93..4754eec2bd 100755 --- a/Makefile.unittests +++ b/Makefile.unittests @@ -57,7 +57,7 @@ VOCDIR := /tmp/vocdir.$(PID) VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`) VOCHOST := 127.0.0.1 SERVER_START := -SERVER_OPT := --configuration none --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system --database.maximal-journal-size 1000000 --javascript.gc-interval 1 $(SERVER_START) +SERVER_OPT := --configuration none --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system --database.maximal-journal-size 1048576 --javascript.gc-interval 1 $(SERVER_START) CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors --quiet STARTFILE := $(VOCDIR)/startup CURL := curl