diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 21:15:18 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 21:15:18 +0100 |
| commit | bd838a68d44a3adce9ae4b2c5e3e17b47eead7c1 (patch) | |
| tree | 9d2bd302f9a79d42e45cd06e21787a94e6f97c75 /t/dejagnu-relative-srcdir.sh | |
| parent | 88ac92b2d5beaf4aee7d7bb4f3dc9a86da823550 (diff) | |
| parent | 6979c8e680b68dbc2b27b4db808cb037ba6aabb7 (diff) | |
| download | automake-bd838a68d44a3adce9ae4b2c5e3e17b47eead7c1.tar.gz | |
Merge branch 'micro' into minor
* micro:
dist: fix bug#18286 "distcheck fails to detect missing files"
tests: expose automake bug#18286 "distcheck fails to detect missing files"
include: fix bug in handling of user-defined makefile fragments generation
tests: expose bug in handling of user-defined makefile fragments generation
Diffstat (limited to 't/dejagnu-relative-srcdir.sh')
| -rw-r--r-- | t/dejagnu-relative-srcdir.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh index 79a37dd3d..34e67101e 100644 --- a/t/dejagnu-relative-srcdir.sh +++ b/t/dejagnu-relative-srcdir.sh @@ -43,7 +43,7 @@ END cat > env.test/env.exp << 'END' set env_srcdir $env(srcdir) send_user "env_srcdir: $env_srcdir\n" -if { [ regexp "^\.\.?$" $env_srcdir ] } { +if { [ regexp "^\.(\./\.\.)?$" $env_srcdir ] } { pass "test_env_src" } else { fail "test_env_src" @@ -52,13 +52,13 @@ END cat > tcl.test/tcl.exp << 'END' send_user "tcl_srcdir: $srcdir\n" -if { [ regexp "^\.\.?$" $srcdir ] } { +if { [ regexp "^\.(\./\.\.)?$" $srcdir ] } { pass "test_tcl_src" } else { fail "test_tcl_src" } send_user "tcl_orig_srcdir: $orig_srcdir\n" -if { [ regexp "^\.\.?$" $orig_srcdir ] } { +if { [ regexp "^\.(\./\.\.)?$" $orig_srcdir ] } { pass "test_tcl_orig_src" } else { fail "test_tcl_orig_src" |