The latest merge of maint into yacc-work has made the definition of
$distdir in various newer yacc/lex tests redundant. The attached
patch (already pushed) addresses this, by removing the redundant
definitions.
Regards,
Stefano
From d986a8006ff7ce7fbe6f50b3242167cefa94448b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Fri, 15 Apr 2011 18:12:05 +0200
Subject: [PATCH] lex/yacc tests: remove redundant $distdir definition
* tests/lex3.test ($distdir): Remove definition, that's already
done in `tests/defs'.
* tests/lexvpath.test: Likewise.
* tests/yacc-basic.test: Likewise.
* tests/yacc-cxx.test: Likewise.
* tests/yacc-d-basic.test: Likewise.
* tests/yacc-d-cxx.test: Likewise.
* tests/yacc-d-vpath.test: Likewise.
* tests/yacc-dist-nobuild-subdir.test: Likewise.
* tests/yacc-dist-nobuild.test: Likewise.
* tests/yacc-mix-c-cxx.test: Likewise.
* tests/yaccvpath.test: Likewise.
---
ChangeLog | 16 ++++++++++++++++
tests/lex3.test | 2 --
tests/lexvpath.test | 2 --
tests/yacc-basic.test | 2 --
tests/yacc-cxx.test | 2 --
tests/yacc-d-basic.test | 2 --
tests/yacc-d-cxx.test | 2 --
tests/yacc-d-vpath.test | 2 --
tests/yacc-dist-nobuild-subdir.test | 2 --
tests/yacc-dist-nobuild.test | 2 --
tests/yacc-mix-c-cxx.test | 2 --
tests/yaccvpath.test | 2 --
12 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1a0363c..468e4f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
2011-04-12 Stefano Lattarini <stefano.lattar...@gmail.com>
+ lex/yacc tests: remove redundant $distdir definition
+ * tests/lex3.test ($distdir): Remove definition, that's already
+ done in `tests/defs'.
+ * tests/lexvpath.test: Likewise.
+ * tests/yacc-basic.test: Likewise.
+ * tests/yacc-cxx.test: Likewise.
+ * tests/yacc-d-basic.test: Likewise.
+ * tests/yacc-d-cxx.test: Likewise.
+ * tests/yacc-d-vpath.test: Likewise.
+ * tests/yacc-dist-nobuild-subdir.test: Likewise.
+ * tests/yacc-dist-nobuild.test: Likewise.
+ * tests/yacc-mix-c-cxx.test: Likewise.
+ * tests/yaccvpath.test: Likewise.
+
+2011-04-12 Stefano Lattarini <stefano.lattar...@gmail.com>
+
test defs: define default $distdir (help reducing duplication)
* tests/defs.in ($distdir): New variable, might be used in
testcases checking distribution-related features.
diff --git a/tests/lex3.test b/tests/lex3.test
index 7509d52..91fc253 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -24,8 +24,6 @@ required=lex
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_LEX
diff --git a/tests/lexvpath.test b/tests/lexvpath.test
index 12f9ca6..3182d67 100755
--- a/tests/lexvpath.test
+++ b/tests/lexvpath.test
@@ -27,8 +27,6 @@ required=lex
set -e
-distdir=$me-1.0
-
cat > lexoutroot.in << 'END'
LEX_OUTPUT_ROOT='@LEX_OUTPUT_ROOT@'
END
diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index 96625cc..d562b7f 100755
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -22,8 +22,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-cxx.test b/tests/yacc-cxx.test
index a6682e5..eacf628 100755
--- a/tests/yacc-cxx.test
+++ b/tests/yacc-cxx.test
@@ -21,8 +21,6 @@
required=yacc
. ./defs || Exit 1
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/yacc-d-basic.test b/tests/yacc-d-basic.test
index 53132b6..17750cd 100755
--- a/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@ -23,8 +23,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
index 4381346..1308c18 100755
--- a/tests/yacc-d-cxx.test
+++ b/tests/yacc-d-cxx.test
@@ -23,8 +23,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
write_parse ()
{
header=$1
diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test
index 0efa61e..3129acb 100755
--- a/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@ -27,8 +27,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-dist-nobuild-subdir.test b/tests/yacc-dist-nobuild-subdir.test
index b6811d7..0076062 100755
--- a/tests/yacc-dist-nobuild-subdir.test
+++ b/tests/yacc-dist-nobuild-subdir.test
@@ -23,8 +23,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-dist-nobuild.test
index 9061f57..c7bc16e 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@ -22,8 +22,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-mix-c-cxx.test b/tests/yacc-mix-c-cxx.test
index 7ed2ef8..4765b5c 100755
--- a/tests/yacc-mix-c-cxx.test
+++ b/tests/yacc-mix-c-cxx.test
@@ -22,8 +22,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 77df917..3009063 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -28,8 +28,6 @@ required=yacc
set -e
-distdir=$me-1.0
-
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_YACC
--
1.7.2.3
