Commit d650d378 authored by Akim Demaille's avatar Akim Demaille
Browse files

2006-07-27 Akim Demaille <akim@Costaguana.local>

        Fix ATF-Kit on Tiger Intel.
        * taf-kit/src/Makefile.am (vcsn_b_LDADD): Rename as...
        (LDADD): these, since they all need argp.
        Pass CONTEXT only, not CONTEXT_HEADER and CONTEXT_NAMESPACE.
        * taf-kit/src/common.hh: Adjust to define them.

        * build-aux/check.mk (check-TESTS): Don't rely on wc not outputing
        space when used as a filter, since that's not what Tiger's wc
        does.  Use grep -c.
parent 681397fa
2006-07-27 Akim Demaille <akim@Costaguana.local>
Fix ATF-Kit on Tiger Intel.
* taf-kit/src/Makefile.am (vcsn_b_LDADD): Rename as...
(LDADD): these, since they all need argp.
Pass CONTEXT only, not CONTEXT_HEADER and CONTEXT_NAMESPACE.
* taf-kit/src/common.hh: Adjust to define them.
* build-aux/check.mk (check-TESTS): Don't rely on wc not outputing
space when used as a filter, since that's not what Tiger's wc
does. Use grep -c.
2006-07-27 Guillaume Leroi <guillaume.leroi@lrde.epita.fr>
Add tests for vcsn-tdc.
......
......@@ -61,12 +61,12 @@ check-TESTS:
@rm -f $(TEST_LOGS); \
$(MAKE) $(TEST_LOGS); \
results=$$(for f in $(TEST_LOGS); do sed 1q $$f; done); \
all=$$(echo "$$results" | wc -l); \
fail=$$(echo "$$results" | grep '^FAIL:' | wc -l); \
pass=$$(echo "$$results" | grep '^PASS:' | wc -l); \
skip=$$(echo "$$results" | grep '^SKIP:' | wc -l); \
xfail=$$(echo "$$results" | grep '^XFAIL:' | wc -l); \
xpass=$$(echo "$$results" | grep '^XPASS:' | wc -l); \
all=$$(echo "$$results" | wc -l | sed -e 's/^[ \t]*//'); \
fail=$$(echo "$$results" | grep -c '^FAIL'); \
pass=$$(echo "$$results" | grep -c '^PASS'); \
skip=$$(echo "$$results" | grep -c '^SKIP'); \
xfail=$$(echo "$$results" | grep -c '^XFAIL'); \
xpass=$$(echo "$$results" | grep -c '^XPASS'); \
case fail=$$fail:xfail=$$xfail:xpass=$$xpass in \
fail=0:xfail=0:xpass=*) \
banner="All $$all tests passed";; \
......
......@@ -39,27 +39,19 @@ COMMON_SOURCES = commands.hh \
predefined_alphabets.hh
vcsn_b_CPPFLAGS = $(AM_CPPFLAGS) \
-DCONTEXT_HEADER="<vaucanson/boolean_automaton.hh>" \
-DCONTEXT_NAMESPACE="vcsn::boolean_automaton"
vcsn_z_CPPFLAGS = $(AM_CPPFLAGS) \
-DCONTEXT_HEADER="<vaucanson/z_automaton.hh>" \
-DCONTEXT_NAMESPACE="vcsn::z_automaton"
vcsn_tdc_CPPFLAGS = $(AM_CPPFLAGS) \
-DCONTEXT_HEADER="<vaucanson/fmp_transducer.hh>" \
-DCONTEXT_NAMESPACE="vcsn::fmp_transducer" \
-DWITH_TWO_ALPHABETS
vcsn_b_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh common_automaton_commands.hh b_commands.cc
vcsn_b_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=boolean_automaton
vcsn_z_SOURCES = $(COMMON_SOURCES) \
ratexp_commands.hh common_automaton_commands.hh z_commands.cc
vcsn_z_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=z_automaton
vcsn_tdc_SOURCES = $(COMMON_SOURCES) \
tdc_commands.cc
vcsn_tdc_CPPFLAGS = $(AM_CPPFLAGS) -DCONTEXT=fmp_transducer \
-DWITH_TWO_ALPHABETS
## ------ ##
## argp. ##
......@@ -67,6 +59,4 @@ vcsn_tdc_SOURCES = $(COMMON_SOURCES) \
# Be sure to fetch the argp we ship.
AM_CPPFLAGS += -I$(top_srcdir)/argp
vcsn_b_LDADD = $(top_builddir)/argp/libargp.la
vcsn_z_LDADD = $(top_builddir)/argp/libargp.la
vcsn_tdc_LDADD = $(top_builddir)/argp/libargp.la
LDADD = $(top_builddir)/argp/libargp.la
......@@ -36,9 +36,12 @@
# define warn(S) std::cerr << S << std::endl
# define warn_(S) std::cerr << S
# if ! (defined (CONTEXT_HEADER) && defined (CONTEXT_NAMESPACE))
# error "CONTEXT_HEADER and CONTEXT_NAMESPACE has to be declared."
# endif /* defined (CONTEXT_HEADER) && defined (CONTEXT_NAMESPACE) */
# ifndef CONTEXT
# error "CONTEXT has to be declared."
# endif
# define CONTEXT_HEADER <vaucanson/CONTEXT.hh>
# define CONTEXT_NAMESPACE vcsn::CONTEXT
# if 0 /* @bug Should use this with dynamic libraries. */
# define VCSN_USE_INTERFACE_ONLY 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment