refactor array-nr test for new test suite layout

diff --git a/tests/.gitignore b/tests/.gitignore
index 273d0d08d478bf25a6c7b9a4a482aeba4f4e0980..3609b85e873b343ecd15277632612dd5df55b44f 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -2,6 +2,8 @@
 *.o
 alloc-extra
 alloc-extra.c
+array-nr
+array-nr.c
 basic-nr
 basic-nr.c
 basic-r

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 042a042a42443f6a7d75c216e5770fb5ad136b67..d9f4ae26c59ecc9bf4b1b254933682dc80e12a99 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,16 +29,19 @@ AM_LOG_FLAGS = $(srcdir)
 
 check_PROGRAMS = \
        alloc-extra \
+       array-nr \
        basic-nr \
        basic-r
 
 alloc_extra_SOURCES = alloc-extra.l
+array_nr_SOURCES = array-nr.l
 basic_nr_SOURCES = basic-nr.l
 basic_r_SOURCES = basic-r.l
 
 EXTRA_DIST = \
        testwrapper.sh \
        alloc-extra.txt \
+       array-nr.txt \
 basic-nr.txt \
        basic-r.txt
 

diff --git a/tests/test-array-nr/scanner.l b/tests/array-nr.l
similarity index 96%
rename from tests/test-array-nr/scanner.l
rename to tests/array-nr.l
index 068c6745100bff0272de3da028a34df6afa60ab9..d961ee9174ef8484ea78019c00f1ec9f01832444 100644 (file)
--- a/tests/test-array-nr/scanner.l
+++ b/tests/array-nr.l
@@ -30,7 +30,7 @@
 
 %}
 
-%option 8bit outfile="scanner.c" prefix="test"
+%option 8bit prefix="test"
 %option nounput nomain noyywrap 
 %option warn array
 

diff --git a/tests/test-array-nr/test.input b/tests/array-nr.txt
similarity index 100%
rename from tests/test-array-nr/test.input
rename to tests/array-nr.txt

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

diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am
deleted file mode 100644 (file)
index a54e3fc..0000000
--- a/tests/test-array-nr/Makefile.am
+++ /dev/null
@@ -1,48 +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 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 
-#YFLAGS = --defines --output=parser.c
-
-testname = test-array-nr
-
-scanner.c: $(srcdir)/scanner.l
-       $(FLEX) $<
-
-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) $<