Added -I . to compiler search path in tests (so it finds the generated parser.h).

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 99fc9006d1d8c07d33a23e9383b0c1f2e462a0a4..895dd72b864b51718a4ee88efc7e33c3f40a299f 100644 (file)
--- 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 79638647da8034ae686cbf2665b9b7bb5778180c..80ceca41933d8380bfe1c394c1ff20112670d934 100644 (file)
--- 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 05236d3957ff4b6eaa30b9a979d2f6dd646ff886..e26b277dceb70d1659703b95501f9fc52fb18a20 100644 (file)
--- 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 131557cc63f57a8b9d069218b76eaf0dbf4a5467..69e1697226d2d569c678dc0606e6f44d347a2966 100644 (file)
--- 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 c3013047fd0a4be7dc78e6f2db37fe8d8e30e5b8..3b91d069255cc8147b236b44f58f81c251da4959 100644 (file)
--- 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 8566472068f325f38f8c3346148c3e27fefef0b6..c2675308cd57807906c160215ebbec04573fdd7d 100644 (file)
--- 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 84883ee78cf00cd11cd71d6161d44bd16f162269..3a1951552a078df8fe9b3a81cbb5b20ed3030f87 100644 (file)
--- 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 48a990c03496d4fe10f685255c22c42e8897748e..2d1cf2b3069066b8b9fcc8937409a0bf5e77b904 100644 (file)
--- 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 d96c7bc280f957e1772508124310fe79b1ffaf10..5bcb4fc8020dd2672a3f6ed26c286ab101997f41 100644 (file)
--- 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 6301092ee50fb2ea2d85e5cddbbefcc54bd7f8d4..7b75b52e1d8dc109524c8a3e63154c0e225ab09b 100644 (file)
--- 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 880483fd7be4ffafbae64eaecad11fe34fd0d776..462b587f1d15a2d479a57c19f12ebe94aef52211 100644 (file)
--- 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 79f07f3e9ad352d75217678c84ac9d0f68cb11e9..7fc285893b68ba59352d9c1a117db17a19bfebf4 100644 (file)
--- 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 9c15cd4e7478cb62cff89b1b8e123c9d34967096..740c0619b71c533e7851454cd263632f06de9b85 100644 (file)
--- 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 60df8d3be8a44f5a01f47e86bcd3a7cd38622646..c195f7d60110eff94afe3e2f1174859e080db319 100644 (file)
--- 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 b0c26c4ce8d46f1690f6b44934a51546aa7fe210..6f62dbdd0e00b1edf448fb3eba5d5bc760da5058 100644 (file)
--- 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 c3d440cbd79433768818c93fb81bc3d3e3a5a255..6013f68183dac74f888f511c87a46a42d08ab943 100644 (file)
--- 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 c3c5db6f0cc9034cdbb0488d2ea885c6cc02b7e6..a17fe60daef9fc60c743c27b3d94ef05683ccd4d 100644 (file)
--- 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 6e3b69604d454cd07a47122cdbbb8069f01c5b8d..de6aecb2f813da76a508fba2413cb5db97e37b8f 100644 (file)
--- 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 fb5a0df32402f98626d2204005e44387bd5dc395..dea496ce9d4ab9d058dddbfc91d9c586a8aec2ea 100644 (file)
--- 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 71501f146d0343d4e56497d3516a6922f9cd6740..3f50193dfa568a0a26f82ce57c3a9f67d44e90d9 100644 (file)
--- 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 8f1c57c6f7da330ae0cb2f4f187a3469aec2f2aa..7019508930cf201e8b0401a1ba50e8c34b19e4e5 100644 (file)
--- 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 e5f2ce6a356dd84c7e40cb257d1595b2c62cd6ad..7613e0d7bdfc3498f057d4a57406df992cc19875 100644 (file)
--- 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 fb36ec30d5a9eb6e4a006d2fcb3bc6292051ddf2..225d5219220595e87eeb1750e0b0c4bf6335b867 100644 (file)
--- 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 6462d5d71362dddc9f3a4dabb8de62bb020a0799..c92387bef879f21def79da0bb966553d9d42c54f 100644 (file)
--- 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