diff options
24 files changed, 24 insertions, 30 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 99fc900..895dd72 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -61,13 +61,7 @@ test: 0 ) echo Test "$$DIR" succeeded.; \ NOK=0$$NOK;\ ;; \ - 1 ) echo Test "$$DIR" FAILED. See "$$dir"/OUTPUT for details. ; \ - NFAIL=0$$NFAIL; \ - ;; \ - 2 ) echo Test "$$DIR" was SKIPPED. See "$$dir"/OUTPUT for details.; \ - NSKIP=0$$NSKIP; \ - ;; \ - * ) echo Test "$$DIR" reported an unknown exit status. Assuming that means it failed. See "$$DIR"/OUTPUT for details.; \ + * ) echo Test "$$DIR" FAILED. See "$$dir"/OUTPUT for details. ; \ NFAIL=0$$NFAIL; \ ;; \ esac; \ diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am index 7963864..80ceca4 100644 --- a/tests/TEMPLATE/Makefile.am +++ b/tests/TEMPLATE/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l parser.y test.input CLEANFILES = scanner.c scanner.h parser.c parser.h TEMPLATE OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am index 05236d3..e26b277 100644 --- a/tests/test-array-nr/Makefile.am +++ b/tests/test-array-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c parser.c parser.h test-array-nr OUTPUT OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am index 131557c..69e1697 100644 --- a/tests/test-array-r/Makefile.am +++ b/tests/test-array-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c test-array-r OUTPUT OBJS = scanner.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am index c301304..3b91d06 100644 --- a/tests/test-basic-nr/Makefile.am +++ b/tests/test-basic-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c parser.c parser.h test-basic-nr OUTPUT OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am index 8566472..c267530 100644 --- a/tests/test-basic-r/Makefile.am +++ b/tests/test-basic-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c parser.c parser.h test-basic-r OUTPUT OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am index 84883ee..3a19515 100644 --- a/tests/test-bison-yylloc/Makefile.am +++ b/tests/test-bison-yylloc/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l parser.y test.input main.c CLEANFILES = scanner.c parser.c parser.h test-bison-yylloc $(OBJS) OUTPUT OBJS = scanner.o parser.o main.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a YFLAGS = --defines --output=parser.c --name-prefix="test" diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am index 48a990c..2d1cf2b 100644 --- a/tests/test-bison-yylval/Makefile.am +++ b/tests/test-bison-yylval/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l parser.y test.input main.c CLEANFILES = scanner.c parser.c parser.h test-bison-yylval $(OBJS) OUTPUT OBJS = parser.o scanner.o main.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a YFLAGS = --defines --output=parser.c --name-prefix="test" diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am index d96c7bc..5bcb4fc 100644 --- a/tests/test-c-cpp-nr/Makefile.am +++ b/tests/test-c-cpp-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c parser.c parser.h test-cpp-nr$(OBJS) OUTPUT OBJS = scanner.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am index 6301092..7b75b52 100644 --- a/tests/test-c-cpp-r/Makefile.am +++ b/tests/test-c-cpp-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c parser.c parser.h test-c-cpp-r $(OBJS) OUTPUT OBJS = scanner.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am index 880483f..462b587 100644 --- a/tests/test-header-nr/Makefile.am +++ b/tests/test-header-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input main.c CLEANFILES = scanner.c scanner.h test-header-nr $(OBJS) OUTPUT OBJS = scanner.o main.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am index 79f07f3..7fc2858 100644 --- a/tests/test-header-r/Makefile.am +++ b/tests/test-header-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input main.c CLEANFILES = scanner.c scanner.h test-header-r OUTPUT $(OBJS) OBJS = scanner.o main.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-include-by-buffer/Makefile.am b/tests/test-include-by-buffer/Makefile.am index 9c15cd4..740c061 100644 --- a/tests/test-include-by-buffer/Makefile.am +++ b/tests/test-include-by-buffer/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-buffer OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-include-by-reentrant/Makefile.am b/tests/test-include-by-reentrant/Makefile.am index 60df8d3..c195f7d 100644 --- a/tests/test-include-by-reentrant/Makefile.am +++ b/tests/test-include-by-reentrant/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-reentrant OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-lineno-nr/Makefile.am b/tests/test-lineno-nr/Makefile.am index b0c26c4..6f62dbd 100644 --- a/tests/test-lineno-nr/Makefile.am +++ b/tests/test-lineno-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c test-lineno-nr OUTPUT $(OBJS) OBJS = scanner.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . testname = test-lineno-nr diff --git a/tests/test-lineno-r/Makefile.am b/tests/test-lineno-r/Makefile.am index c3d440c..6013f68 100644 --- a/tests/test-lineno-r/Makefile.am +++ b/tests/test-lineno-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c test-lineno-r OUTPUT $(OBJS) OBJS = scanner.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . testname = test-lineno-r diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am index c3c5db6..a17fe60 100644 --- a/tests/test-multiple-scanners-nr/Makefile.am +++ b/tests/test-multiple-scanners-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner-1.l scanner-2.l main.c CLEANFILES = scanner-1.c scanner-1.h test-multiple-scanners-nr OUTPUT $(OBJS) scanner-2.c scanner-2.h OBJS = scanner-1.o scanner-2.o main.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am index 6e3b696..de6aecb 100644 --- a/tests/test-multiple-scanners-r/Makefile.am +++ b/tests/test-multiple-scanners-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner-1.l scanner-2.l main.c CLEANFILES = scanner-1.c scanner-1.h test-multiple-scanners-r OUTPUT $(OBJS) scanner-2.c scanner-2.h OBJS = scanner-1.o scanner-2.o main.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #YFLAGS = --defines --output=parser.c diff --git a/tests/test-prefix-nr/Makefile.am b/tests/test-prefix-nr/Makefile.am index fb5a0df..dea496c 100644 --- a/tests/test-prefix-nr/Makefile.am +++ b/tests/test-prefix-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c scanner.h parser.c parser.h test-prefix-nr OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am index 71501f1..3f50193 100644 --- a/tests/test-prefix-r/Makefile.am +++ b/tests/test-prefix-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c scanner.h parser.c parser.h test-prefix-r OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am index 8f1c57c..7019508 100644 --- a/tests/test-pthread/Makefile.am +++ b/tests/test-pthread/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input test-4.input test- CLEANFILES = scanner.c scanner.h parser.c parser.h test-pthread OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . LDFLAGS = -lpthread #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-string-nr/Makefile.am b/tests/test-string-nr/Makefile.am index e5f2ce6..7613e0d 100644 --- a/tests/test-string-nr/Makefile.am +++ b/tests/test-string-nr/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l CLEANFILES = scanner.c scanner.h parser.c parser.h test-string-nr OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-string-r/Makefile.am b/tests/test-string-r/Makefile.am index fb36ec3..225d521 100644 --- a/tests/test-string-r/Makefile.am +++ b/tests/test-string-r/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l CLEANFILES = scanner.c scanner.h parser.c parser.h test-string-r OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c diff --git a/tests/test-yyextra/Makefile.am b/tests/test-yyextra/Makefile.am index 6462d5d..c92387b 100644 --- a/tests/test-yyextra/Makefile.am +++ b/tests/test-yyextra/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input CLEANFILES = scanner.c scanner.h parser.c parser.h test-yyextra OUTPUT $(OBJS) OBJS = scanner.o # parser.o -INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) +INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I . #LDFLAGS = $(top_srcdir)/libfl.a #LFLAGS = --header="scanner.h" #YFLAGS = --defines --output=parser.c |