diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 15 | ||||
| -rw-r--r-- | tools/configure.ac | 14 | ||||
| -rwxr-xr-x | tools/pre-commit | 6 | ||||
| -rwxr-xr-x | tools/proof | 11 | ||||
| -rwxr-xr-x | tools/push | 4 |
5 files changed, 34 insertions, 16 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 42e6a1af..c38f529c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -235,7 +235,7 @@ libledger_python_la_SOURCES = \ libledger_python_la_CPPFLAGS = $(lib_cppflags) -I$(srcdir)/python -pyexec_LTLIBRARIES = ledger.la +pyexec_LTLIBRARIES = ledger.la ledger_la_CPPFLAGS = $(libledger_python_la_CPPFLAGS) ledger_la_SOURCES = src/pyledger.cc @@ -243,7 +243,7 @@ ledger_la_DEPENDENCIES = $(lib_LTLIBRARIES) ledger_la_LDFLAGS = -avoid-version -module ledger_la_LIBADD = $(LIBOBJS) $(lib_LTLIBRARIES) -pkgpython_PYTHON = python/__init__.py python/server.py +pkgpython_PYTHON = python/__init__.py python/server.py endif @@ -408,7 +408,7 @@ ConfirmTests: $(srcdir)/test/ConfirmTests.py GenerateTests_SOURCES = test/GenerateTests.py GenerateTests: $(srcdir)/test/GenerateTests.py - echo "$(PYTHON) $(srcdir)/test/GenerateTests.py $(top_builddir)/ledger$(EXEEXT) $(srcdir) 1 20 \"\$$@\"" > $@ + echo "$(PYTHON) $(srcdir)/test/GenerateTests.py $(top_builddir)/ledger$(EXEEXT) $(srcdir) 1 ${1:-20} \"\$$@\"" > $@ chmod 755 $@ FULLCHECK=$(srcdir)/test/fullcheck.sh @@ -433,13 +433,14 @@ endif fullcheck: cppunittests @$(top_builddir)/RegressTests --verify @$(top_builddir)/BaselineTests --verify - @$(top_builddir)/ManualTests --verify + @$(top_builddir)/ManualTests --verify @$(top_builddir)/ConfirmTests --verify - @$(top_builddir)/GenerateTests --verify + @$(top_builddir)/GenerateTests 20 --verify @$(top_builddir)/RegressTests --gmalloc @$(top_builddir)/BaselineTests --gmalloc - @$(top_builddir)/ManualTests --gmalloc -# @$(top_builddir)/ConfirmTests --gmalloc + @$(top_builddir)/ManualTests --gmalloc + @$(top_builddir)/ConfirmTests --gmalloc + @$(top_builddir)/GenerateTests 10000 # @$(top_builddir)/GenerateTests --gmalloc ###################################################################### diff --git a/tools/configure.ac b/tools/configure.ac index c0a03249..e3149a18 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -65,6 +65,16 @@ AC_ARG_ENABLE(doxygen, AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue) +AC_ARG_ENABLE(cache, + [ --enable-cache Enable use of the --cache option], + [case "${enableval}" in + yes) cache=true ;; + no) cache=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-cache) ;; + esac],[cache=false]) + +AM_CONDITIONAL(USE_CACHE_OPTION, test x$cache = xtrue) + AC_ARG_ENABLE(python, [ --enable-python Turn on Python support (experimental)], [case "${enableval}" in @@ -340,11 +350,11 @@ AC_CACHE_CHECK( AC_LANG_POP LIBS=$boost_serialization_save_libs]) -if [test x$boost_serialization_cpplib_avail_cv_ = xtrue ]; then +if [test x$boost_serialization_cpplib_avail_cv_ = xtrue -a x$cache = xtrue]; then AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available]) LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS" fi -AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue) +AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue -a x$cache = xtrue) # check for Python if [ test x$python = xtrue ]; then diff --git a/tools/pre-commit b/tools/pre-commit index 50a32dbd..db47cc45 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Exit with status 1 if any command below fails set -e @@ -12,6 +12,9 @@ fi # These are the locations I keep my temporary source and build trees in PRODUCTS=$(./acprep products) # generates a build directory name such as # ~/Products/ledger +if echo $PRODUCTS | grep -qv ledger; then + PRODUCTS=$PRODUCTS/ledger +fi TMPDIR=$PRODUCTS/pre-commit MIRROR=$PRODUCTS/pre-commit-mirror @@ -56,6 +59,7 @@ fi # Finally, (re)build this proposed source tree and see if it passes # muster. + if [ -f acprep ]; then nice -n 20 ./acprep default --warn make check else diff --git a/tools/proof b/tools/proof index 5a329a50..755c3fe7 100755 --- a/tools/proof +++ b/tools/proof @@ -12,17 +12,18 @@ if [[ -f ~/Products/last-proofed && \ exit 0 fi -rm -fr ~/Products/ledger* +rm -fr ~/Products/ledger-proof -time ./acprep --universal -j16 --warn proof 2>&1 | \ +time ./acprep --enable-cache --enable-doxygen \ + --universal -j16 --warn proof 2>&1 | \ tee ~/Desktop/proof.log if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then if [[ "$1" = "--alert" ]]; then - notify "Ledger proof build FAILED" + notify "Ledger proof build FAILED" else - echo "Ledger proof build FAILED" - exit 1 + echo "Ledger proof build FAILED" + exit 1 fi else echo "Ledger proof build succeeded" @@ -10,6 +10,8 @@ git checkout next git rebase master git push git checkout master -./acprep --universal -j16 --warn opt upload +./acprep --enable-cache --universal -j16 --warn opt upload +./acprep --enable-cache --universal -j16 --warn opt make speedtest | \ + tee build/last-speed.txt mv *.dmg* build git checkout next |