diff options
author | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
commit | 40f553228f5a28034c6635fdcb4c86af28a385ed (patch) | |
tree | 2c40305c9f9841a4c3d453a4a5c49ec69056b4b2 /tools/Makefile.am | |
parent | 556211e623cad88213e5087b5c9c36e754d9aa02 (diff) | |
parent | b1b4e2aadff5983d443d70c09ea86a41b015873f (diff) | |
download | fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.gz fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.bz2 fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.zip |
Merge branch 'next'
Diffstat (limited to 'tools/Makefile.am')
-rw-r--r-- | tools/Makefile.am | 15 |
1 files changed, 8 insertions, 7 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 ###################################################################### |