Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

calc++: factor for other extracted tests.

Browse Source 
* Makefile.am (TESTS, check_PROGRAMS): Initialize here.
	* examples/local.mk (doc, extexi): Define here.
	* examples/calc++/local.mk: Adjust accordingly.
	* configure.ac: Ask for parallel-tests (for the way the logs
	are handled).
	* examples/calc++/test: As a consequence, always be verbose.
	($prog): New.
	(run): Use it.
	Sort the tests in a more natural order (simplest first).
This commit is contained in:
Akim Demaille
2012-02-16 15:27:03 +01:00
parent aeb57fb68d
commit 2e4986a88d
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -41,10 +41,12 @@ AM_CFLAGS = $(WARN_CFLAGS)
AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
BUILT_SOURCES = BUILT_SOURCES =
DISTCLEANFILES = DISTCLEANFILES =
MOSTLYCLEANDIRS =
MOSTLYCLEANFILES = MOSTLYCLEANFILES =
SUFFIXES = SUFFIXES =
TESTS =
check_PROGRAMS =
noinst_LIBRARIES = noinst_LIBRARIES =
MOSTLYCLEANDIRS =
include build-aux/local.mk include build-aux/local.mk
include data/local.mk include data/local.mk

4
configure.ac
View File

@@ -45,7 +45,9 @@ AC_CONFIG_MACRO_DIR([m4])
# releases, we want to be able run make dist without being required to # releases, we want to be able run make dist without being required to
# add a bogus NEWS entry. In that case, the version string # add a bogus NEWS entry. In that case, the version string
# automatically contains a dash, which we also let disable gnits. # automatically contains a dash, which we also let disable gnits.
AM_INIT_AUTOMAKE([1.11.1 dist-xz nostdinc silent-rules] AM_INIT_AUTOMAKE([1.11.1 dist-xz nostdinc
color-tests parallel-tests
silent-rules]
m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]], m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[-_]],
[gnu], [gnits])) [gnu], [gnits]))
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])

12
examples/calc++/local.mk
View File

@@ -19,8 +19,6 @@
## Extracting. ## ## Extracting. ##
## ------------ ## ## ------------ ##
doc = $(top_srcdir)/doc/bison.texinfo
extexi = $(top_srcdir)/examples/extexi
# Extract in src. # Extract in src.
$(top_srcdir)/examples/calc++/calc.stamp: $(doc) $(extexi) $(top_srcdir)/examples/calc++/calc.stamp: $(doc) $(extexi)
$(AM_V_GEN)rm -f $@ $@.tmp $(AM_V_GEN)rm -f $@ $@.tmp
@@ -37,9 +35,9 @@ $(calc_extracted): $(top_srcdir)/examples/calc++/calc.stamp
$(MAKE) $(AM_MAKEFLAGS) $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \
fi fi
## --------------------------- ## ## -------------------- ##
## Building & testing calc++. ## ## Building & testing. ##
## --------------------------- ## ## -------------------- ##
BUILT_SOURCES += $(calc_sources) examples/calc++/calc++-parser.h BUILT_SOURCES += $(calc_sources) examples/calc++/calc++-parser.h
CLEANFILES += *.tmp CLEANFILES += *.tmp
@@ -59,13 +57,13 @@ calc_generated = \
calc_sources = \ calc_sources = \
$(calc_extracted) $(calc_generated) $(calc_extracted) $(calc_generated)
if BISON_CXX_WORKS if BISON_CXX_WORKS
check_PROGRAMS = examples/calc++/calc++ check_PROGRAMS += examples/calc++/calc++
examples_calc___calc___SOURCES = \ examples_calc___calc___SOURCES = \
$(calc_sources) \ $(calc_sources) \
examples/calc++/y.tab.h \ examples/calc++/y.tab.h \
examples/calc++/calc++-parser.hh examples/calc++/calc++-parser.hh
examples_calc___calc___CPPFLAGS = -I$(top_srcdir)/examples/calc++ examples_calc___calc___CPPFLAGS = -I$(top_srcdir)/examples/calc++
TESTS = examples/calc++/test TESTS += examples/calc++/test
endif endif
EXTRA_DIST += examples/calc++/test EXTRA_DIST += examples/calc++/test

27
examples/calc++/test
View File

@@ -15,11 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
test -z "$VERBOSE" && {
exec > /dev/null 2>&1
set -x
}
me=`basename $0` me=`basename $0`
# Number of the current test. # Number of the current test.
@@ -28,6 +23,9 @@ number=1
# Exit status of this script. # Exit status of this script.
exit=true exit=true
# The exercised program.
prog=./examples/calc++/calc++
# run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS] # run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
# --------------------------------------------------------- # ---------------------------------------------------------
run () run ()
@@ -37,7 +35,7 @@ run ()
shift shift
local out_exp=$1 local out_exp=$1
shift shift
./examples/calc++/calc++ "$@" input >out_eff $prog "$@" - <input >out_eff
local sta_eff=$? local sta_eff=$?
local out_eff=`cat out_eff` local out_eff=`cat out_eff`
if test $sta_eff -eq $sta_exp; then if test $sta_eff -eq $sta_exp; then
@@ -56,6 +54,14 @@ run ()
number=`expr $number + 1` number=`expr $number + 1`
} }
cat >input <<EOF
toto := 1
toto
EOF
run 0 1 -s
cat >input <<EOF cat >input <<EOF
a := 1 a := 1
b := 2 b := 2
@@ -81,14 +87,7 @@ cat >input <<EOF
a := 1 a := 1
d := a + b * c d := a + b * c
EOF EOF
run 1 '' input run 1 ''
cat >input <<EOF
toto := 1
toto
EOF
run 0 1 -s
rm input out_eff rm input out_eff
$exit $exit

2
examples/local.mk
View File

@@ -13,6 +13,8 @@
## You should have received a copy of the GNU General Public License ## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
doc = $(top_srcdir)/doc/bison.texinfo
extexi = $(top_srcdir)/examples/extexi
dist_noinst_SCRIPTS = examples/extexi dist_noinst_SCRIPTS = examples/extexi
include examples/calc++/local.mk include examples/calc++/local.mk