refactor prefix_r test for new test suite layout

diff --git a/tests/.gitignore b/tests/.gitignore
index d5afa67d57b89c7cedfd7c2a7e95cceb325f6820..1002a2804e08be3d7a7e75705c557d15ed5256fa 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -43,4 +43,6 @@ noansi_r.c
 posix
 posix.c
 prefix_nr
-prefix_nr.c
\ No newline at end of file
+prefix_nr.c
+prefix_r
+prefix_r.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2cdb49301c2731985eeedb93ee313e1f994d59a1..06036e96e62aa76eb8d74863dd9aa6839a581609 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,8 @@ check_PROGRAMS = \
        noansi_nr \
        noansi_r \
        posix \
-       prefix_nr
+       prefix_nr \
+       prefix_r
 
 alloc_extra_SOURCES = alloc_extra.l
 array_nr_SOURCES = array_nr.l
@@ -68,6 +69,7 @@ noansi_nr_SOURCES = noansi_nr.l
 noansi_r_SOURCES = noansi_r.l
 posix_SOURCES = posix.l
 prefix_nr_SOURCES = prefix_nr.l
+prefix_r_SOURCES = prefix_r.l
 
 BUILT_SOURCES = \
        bison_nr_scanner.h \
@@ -105,7 +107,8 @@ basic_nr.txt \
        mem_r.txt \
        noansi_nr.txt \
        noansi_r.txt \
-       prefix_nr.txt
+       prefix_nr.txt \
+       prefix_r.txt
 
 # specify how to process .l files in order to test the flex built by make all
 

diff --git a/tests/test-prefix-r/scanner.l b/tests/prefix_r.l
similarity index 98%
rename from tests/test-prefix-r/scanner.l
rename to tests/prefix_r.l
index 4c25982871070e257f358af16bd9e72cc496bf0f..848ac3ef755e0dd123c80d38fb7ad6bb02f8f4f7 100644 (file)
--- a/tests/test-prefix-r/scanner.l
+++ b/tests/prefix_r.l
@@ -30,7 +30,7 @@
 
 %}
 %option reentrant
-%option 8bit outfile="scanner.c" prefix="FOO"
+%option 8bit prefix="FOO"
 %option nounput nomain noyywrap 
 %option warn
 

diff --git a/tests/test-prefix-r/test.input b/tests/prefix_r.txt
similarity index 100%
rename from tests/test-prefix-r/test.input
rename to tests/prefix_r.txt

diff --git a/tests/test-prefix-r/.gitignore b/tests/test-prefix-r/.gitignore
deleted file mode 100644 (file)
index eb782b4..0000000
--- a/tests/test-prefix-r/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-parser.c
-parser.h
-scanner.c
-test-prefix-r
-OUTPUT

diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am
deleted file mode 100644 (file)
index 1021029..0000000
--- a/tests/test-prefix-r/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file is part of flex.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-
-# Neither the name of the University nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE.
-
-
-FLEX = $(top_builddir)/flex
-
-EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
-OBJS = scanner.o # parser.o
-
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
-#LDFLAGS = $(top_srcdir)/libfl.a 
-#LFLAGS = --header="scanner.h"
-#YFLAGS = --defines --output=parser.c
-
-testname = test-prefix-r
-
-scanner.c: $(srcdir)/scanner.l
-       $(FLEX) $(LFLAGS) $<
-
-parser.c: $(srcdir)/parser.y
-       $(BISON) $(YFLAGS) $<
-
-$(testname)$(EXEEXT): $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
-
-test: $(testname)$(EXEEXT)
-       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
-
-.c.o:
-       $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-prefix-r/README b/tests/test-prefix-r/README
deleted file mode 100644 (file)
index 91f75c9..0000000
--- a/tests/test-prefix-r/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This check is to make sure the prefix "yy" is substituted where it should be.
-