From a7983a0f81d2135387138b563acac6ad0fb0f5f8 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Sat, 26 Nov 2011 14:54:00 +0100 Subject: [PATCH] tests: fix 'distcheck-override-infodir.test' on Cygwin * tests/distcheck-override-infodir.test (Makefile.am): Do not add any `/' between $(DESTDIR) and the following paths. Otherwise, when $(DESTDIR) is empty, the recipes will try to access files with a leading double slash, which have an implementation-defined interpretation (e.g., for Cygwin, they mean UNC paths). --- ChangeLog | 9 +++++++++ tests/distcheck-override-infodir.test | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8e6587f7..2ad35bb2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-11-28 Peter Rosin + + tests: fix 'distcheck-override-infodir.test' on Cygwin + * tests/distcheck-override-infodir.test (Makefile.am): Do not add + any `/' between $(DESTDIR) and the following paths. Otherwise, + when $(DESTDIR) is empty, the recipes will try to access files + with a leading double slash, which have an implementation-defined + interpretation (e.g., for Cygwin, they mean UNC paths). + 2011-11-24 Stefano Lattarini cosmetics: typofix in comments diff --git a/tests/distcheck-override-infodir.test b/tests/distcheck-override-infodir.test index 19ad3d158..3cf38c5d9 100755 --- a/tests/distcheck-override-infodir.test +++ b/tests/distcheck-override-infodir.test @@ -32,11 +32,11 @@ info_TEXINFOS = main.texi ## Sanity check. installcheck-local: if test x$${infodir+set} != xset; then \ - ls -l "$(DESTDIR)/$(prefix)/blah/blah/foobar/" || exit 1; \ - test -f "$(DESTDIR)/$(prefix)/blah/blah/foobar/dir" || exit 1; \ + ls -l "$(DESTDIR)$(prefix)/blah/blah/foobar/" || exit 1; \ + test -f "$(DESTDIR)$(prefix)/blah/blah/foobar/dir" || exit 1; \ else \ - ls -l "$(DESTDIR)/$$infodir/" || exit 1; \ - test -f "$(DESTDIR)/$$infodir/dir" || exit 1; \ + ls -l "$(DESTDIR)$$infodir/" || exit 1; \ + test -f "$(DESTDIR)$$infodir/dir" || exit 1; \ fi END -- 2.11.4.GIT