refactor array-r test for new test suite layout

6 files changed, 6 insertions, 53 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 3609b85..2f3113a 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -4,6 +4,8 @@ alloc-extra
 alloc-extra.c
 array-nr
 array-nr.c
+array-r
+array-r.c
 basic-nr
 basic-nr.c
 basic-r
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4742435..63bbadd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,11 +27,13 @@ AM_LOG_FLAGS = $(srcdir)
 check_PROGRAMS = \
 	alloc-extra \
 	array-nr \
+	array-r \
 	basic-nr \
 	basic-r
 
 alloc_extra_SOURCES = alloc-extra.l
 array_nr_SOURCES = array-nr.l
+array_r_SOURCES = array-r.l
 basic_nr_SOURCES = basic-nr.l
 basic_r_SOURCES = basic-r.l
 
@@ -40,6 +42,7 @@ EXTRA_DIST = \
 	testwrapper.sh \
 	alloc-extra.txt \
 	array-nr.txt \
+	array-r.txt \
 basic-nr.txt \
 	basic-r.txt
 
diff --git a/tests/test-array-r/scanner.l b/tests/array-r.l
index 2d4c1b1..0285240 100644
--- a/tests/test-array-r/scanner.l
+++ b/tests/array-r.l
@@ -30,7 +30,7 @@
 
 %}
 
-%option 8bit outfile="scanner.c" prefix="test"
+%option 8bit prefix="test"
 %option nounput nomain noyywrap 
 %option warn array reentrant
 
diff --git a/tests/test-array-r/test.input b/tests/array-r.txt
index 7288a40..7288a40 100644
--- a/tests/test-array-r/test.input
+++ b/tests/array-r.txt
diff --git a/tests/test-array-r/.gitignore b/tests/test-array-r/.gitignore
deleted file mode 100644
index 267397d..0000000
--- a/tests/test-array-r/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-parser.c
-parser.h
-scanner.c
-test-array-r
-OUTPUT
-Makefile.in
diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am
deleted file mode 100644
index b60c917..0000000
--- a/tests/test-array-r/Makefile.am
+++ /dev/null
@@ -1,45 +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 $(testname)$(EXEEXT) OUTPUT $(OBJS)
-OBJS = scanner.o
-
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
-#LDFLAGS = $(top_srcdir)/libfl.a 
-#YFLAGS = --defines --output=parser.c
-
-testname = test-array-r
-
-scanner.c: $(srcdir)/scanner.l
-	$(FLEX) $<
-
-$(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) $<