Add tests for tighter file name patterns in bad directory names

Also fixes a minor bug in the testsuite that prevented $BDIR from being
properly substituted in messages for these tests.

diff --git a/testsuite/gatekeeper.all/03_triplet.exp b/testsuite/gatekeeper.all/03_triplet.exp
index 7084ceff8bd53bc0738dcdb8a94483b241aef1a0..250d7c02d24f5b40e8e4236abdec69df5875b8a6 100644 (file)
--- a/testsuite/gatekeeper.all/03_triplet.exp
+++ b/testsuite/gatekeeper.all/03_triplet.exp
@@ -1013,8 +1013,10 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     foreach BDIR {
        foo/bar/../baz
        /foo/bar/baz
+       foo/+bar
        foo/-bar
        foo/.bar
+       foo/_bar
     } {
        check_triplet "bogus: v$FVER format directive\
                        with bad directory $BDIR" \
@@ -1035,7 +1037,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
                    } dsig { good 0C 1000 }
                    file { test } fsig { good 0D 1000 }
                }
-           }] check {
+           }] check [subst {
                file-tree {
                    { incoming stage pub archive } empty {}
                    { in-stage } files {
@@ -1050,7 +1052,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
                } email-to {
                    ftp-upload-script@gnu.org foo@example.gnu.org
                }
-           }
+           }]
     }
 
     check_triplet "bogus: v$FVER format directive with directory too deep" \