diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-12-01 23:32:22 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-12-01 23:32:22 +0200 |
| commit | a6a0845cddb30bbe273b3f3cba2ce7fb54c3ae06 (patch) | |
| tree | de5fea1b35c2ae1a6a10f98881210d18e26cb4f5 | |
| parent | 0309026f317e4581400d245a1fea04533eb1c52f (diff) | |
| parent | 34c3d2a82dd5f084d76d572ea06ed0ded9a0a14b (diff) | |
| download | egawk-a6a0845cddb30bbe273b3f3cba2ce7fb54c3ae06.tar.gz egawk-a6a0845cddb30bbe273b3f3cba2ce7fb54c3ae06.tar.bz2 egawk-a6a0845cddb30bbe273b3f3cba2ce7fb54c3ae06.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 10 | ||||
| -rw-r--r-- | test/Makefile.in | 10 |
3 files changed, 19 insertions, 6 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 3a115112..dda3be6c 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2013-12-01 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (fts): Add a check for Cygwin on NFS and print + a message, similar to that of IRIX. Per Corinna Vinschen. + 2013-11-29 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (pipeio3): Removed test and reference to files. diff --git a/test/Makefile.am b/test/Makefile.am index a4f14f18..3d389923 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1815,10 +1815,14 @@ readdir: @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: - @if [ "`uname`" = IRIX ]; then \ + @case `uname` in \ + IRIX) \ echo This test may fail on IRIX systems when run on an NFS filesystem.; \ - echo If it does, try rerunning on an xfs filesystem. ; \ - fi + echo If it does, try rerunning on an xfs filesystem. ;; \ + CYGWIN*) \ + echo This test may fail on CYGWIN systems when run on an NFS filesystem.; \ + echo If it does, try rerunning on an ntfs filesystem. ;; \ + esac @echo $@ @$(AWK) -f "$(srcdir)"/fts.awk @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ diff --git a/test/Makefile.in b/test/Makefile.in index 2e656a42..a34e1d72 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2210,10 +2210,14 @@ readdir: @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: - @if [ "`uname`" = IRIX ]; then \ + @case `uname` in \ + IRIX) \ echo This test may fail on IRIX systems when run on an NFS filesystem.; \ - echo If it does, try rerunning on an xfs filesystem. ; \ - fi + echo If it does, try rerunning on an xfs filesystem. ;; \ + CYGWIN*) \ + echo This test may fail on CYGWIN systems when run on an NFS filesystem.; \ + echo If it does, try rerunning on an ntfs filesystem. ;; \ + esac @echo $@ @$(AWK) -f "$(srcdir)"/fts.awk @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ |