From 1caaec5d4ce0c4db2c71fd0fa647eda9976311c6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sun, 1 Nov 2020 07:39:49 -0800
Subject: [PATCH] dfa-tests: test for invalid-merge fix

* tests/test-dfa-invalid-merge.sh: New file.
* modules/dfa-tests (Files): Add it.
(TESTS): Add it.
---
 ChangeLog                       |  6 ++++++
 modules/dfa-tests               |  2 ++
 tests/test-dfa-invalid-merge.sh | 31 +++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100755 tests/test-dfa-invalid-merge.sh

diff --git a/ChangeLog b/ChangeLog
index 8cc39d386..9ca3c6f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-11-01  Jim Meyering  <meyering@fb.com>
+
+	dfa-tests: test for today's fix
+	* modules/dfa-tests (Files): Add it.
+	* tests/test-dfa-invalid-merge.sh: New file.
+
 2020-10-30  Bernhard Voelker  <mail@bernhard-voelker.de>

 	verify tests: avoid -Wmissing-declarations warnings
diff --git a/modules/dfa-tests b/modules/dfa-tests
index 2775ccbbf..878e18d6d 100644
--- a/modules/dfa-tests
+++ b/modules/dfa-tests
@@ -2,6 +2,7 @@ Files:
 tests/test-dfa-match.sh
 tests/test-dfa-match-aux.c
 tests/test-dfa-invalid-char-class.sh
+tests/test-dfa-invalid-merge.sh

 Depends-on:
 stdio
@@ -14,6 +15,7 @@ configure.ac:
 Makefile.am:
 TESTS += \
   test-dfa-invalid-char-class.sh \
+  test-dfa-invalid-merge.sh \
   test-dfa-match.sh

 check_PROGRAMS += test-dfa-match-aux
diff --git a/tests/test-dfa-invalid-merge.sh b/tests/test-dfa-invalid-merge.sh
new file mode 100755
index 000000000..dee64f2c2
--- /dev/null
+++ b/tests/test-dfa-invalid-merge.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# The DFA matcher would wrongly convert a regular expression like
+# a+a+a to a+a, thus possibly reporting a false match.
+# Introduced in v0.1-2111-g4299106ce
+
+# Copyright 2020 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+# Add "." to PATH for the use of test-dfa-match-aux.
+path_prepend_ .
+
+fail=0
+
+returns_ 1 LC_ALL=C ${CHECKER} test-dfa-match-aux x+x+x+ xx > out 2>&1
+compare /dev/null out || fail=1
+
+Exit $fail
-- 
2.29.0.rc1

