diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-12-16 04:25:45 +0000 |
| commit | 79df573326e6911d3a97fcc2528105acd1c2c525 (patch) | |
| tree | 70930bcdb620cdf8ff9e3e9c495f67ed8317aa2e /test/regress | |
| parent | 8cb3a7b556e8b4b85745bffbd1f0246e6af29588 (diff) | |
Fixes to the build system:
Makefile.am files - remove obsolete INCLUDES, incorporate into AM_CPPFLAGS
Makefile files in src/ - support "make" under src/ (current build profile)
configure.ac - updates to fix warnings
config/antlr.m4 - updates to fix warnings
autogen.sh - updates to generate warnings from autotools; also support Macs
src/include/cvc4_config.h - guard with #ifdef
total reimplementation of NodeBuilder
ExprValue => NodeValue
context_mm.{h,cpp} - fixed numerous compile errors
Diffstat (limited to 'test/regress')
| -rw-r--r-- | test/regress/Makefile | 5 | ||||
| -rw-r--r-- | test/regress/Makefile.am | 2 | ||||
| -rw-r--r-- | test/regress/Makefile.in | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test/regress/Makefile b/test/regress/Makefile new file mode 100644 index 000000000..c4e305306 --- /dev/null +++ b/test/regress/Makefile @@ -0,0 +1,5 @@ +topdir = ../.. +srcdir = test/regress +builddir = $(topdir)/builds/$(srcdir) + +include $(topdir)/Makefile.subdir diff --git a/test/regress/Makefile.am b/test/regress/Makefile.am index a4a06c10b..61527e4d8 100644 --- a/test/regress/Makefile.am +++ b/test/regress/Makefile.am @@ -1,4 +1,4 @@ -TESTS_ENVIRONMENT = echo +TESTS_ENVIRONMENT = @top_builddir@/bin/cvc4 TESTS = \ simple.cvc \ simple.smt \ diff --git a/test/regress/Makefile.in b/test/regress/Makefile.in index 451d333e2..14c032220 100644 --- a/test/regress/Makefile.in +++ b/test/regress/Makefile.in @@ -77,6 +77,7 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXTEST = @CXXTEST@ CXXTESTGEN = @CXXTESTGEN@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ @@ -188,7 +189,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS_ENVIRONMENT = echo +TESTS_ENVIRONMENT = @top_builddir@/bin/cvc4 TESTS = \ simple.cvc \ simple.smt \ |