Re: [PATCH] Convert the testsuite to autotest

[Tim Landscheidt]

I wrote:

> attached is a bzipped patch to convert the testsuite to
> autotest.  A fine-grained version that proves that the data
> files are imported verbatim can be found at
> <URI:https://github.com/scfc/flex/tree/autotest>.

>   The patch is based on my previous "m4-nopreproc" patch but
> it should be possible to adapt it to HEAD if care is taken
> of the "--skeldir" option.

After applying Fedora's patch for C++, I noticed that the
expected output for "c++-basic" and "c++-multiple-scanners"
was wrong.  Attached patch fixes that.

Tim

diff --git a/tests/c++-basic.at b/tests/c++-basic.at
index af95eed..7256d35 100644
--- a/tests/c++-basic.at
+++ b/tests/c++-basic.at
@@ -61,7 +61,9 @@ AT_DATA([[test.input]], [[0000 foo 1111 foo 0000 bar
 AT_CHECK([["$abs_top_builddir/flex" --skeldir "$abs_top_builddir/data" -+ 
scanner.l]])
 AT_CHECK([[$CXX -c -o scanner.o -I"$abs_top_builddir" $CPPFLAGS $CXXFLAGS 
scanner.cpp]])
 AT_CHECK([[$CXX -o test-c++-basic $LDFLAGS scanner.o]])
-AT_CHECK([[./test-c++-basic < test.input]], [[0]], [[TEST RETURNING OK.
+AT_CHECK([[./test-c++-basic < test.input]], [[0]], [[
+
+TEST RETURNING OK.
 ]])
 
 AT_CLEANUP
diff --git a/tests/c++-multiple-scanners.at b/tests/c++-multiple-scanners.at
index cbaefc1..2ba6213 100644
--- a/tests/c++-multiple-scanners.at
+++ b/tests/c++-multiple-scanners.at
@@ -119,7 +119,8 @@ AT_CHECK([[$CXX -c -o scanner-1.o -I"$abs_top_builddir" 
$CPPFLAGS $CXXFLAGS scan
 AT_CHECK([[$CXX -c -o scanner-2.o -I"$abs_top_builddir" $CPPFLAGS $CXXFLAGS 
scanner-2.cpp]])
 AT_CHECK([[$CXX -c -o main.o -I"$abs_top_builddir" $CPPFLAGS $CXXFLAGS 
main.cpp]])
 AT_CHECK([[$CXX -o test-c++-multiple-scanners $LDFLAGS scanner-1.o scanner-2.o 
main.o]])
-AT_CHECK([[./test-c++-multiple-scanners < test.input]], [[0]], [[TEST 
RETURNING OK.
+AT_CHECK([[./test-c++-multiple-scanners < test.input]], [[0]], [[NOW WRAPPING.
+TEST RETURNING OK.
 ]])
 
 AT_CLEANUP