diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-24 00:59:09 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-24 00:59:09 +0100 |
| commit | 5fe2bfee7631572b39f59307d7076dbaa9b6fc5e (patch) | |
| tree | 764e459b2ee6f663bd45cd67f50212f74247599f /t/dejagnu-relative-srcdir.sh | |
| parent | 108a98575462e54dffa0083a773a46c57a23a113 (diff) | |
| parent | c24233d4194639cf2f87ceee162b0f0525ecdbd3 (diff) | |
| download | automake-5fe2bfee7631572b39f59307d7076dbaa9b6fc5e.tar.gz | |
Merge branch 'master' into ng/master
* master:
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
+ Extra non-trivial changes:
* lib/am/distcheck.mk: Backport the changes done to lib/am/distdir.am
in commit v1.14.1-4-g01a7a4a (fix for automake bug#18286 "distcheck
fails to detect missing files").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
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" |