aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pc/ChangeLog4
-rw-r--r--pc/Makefile.tst19
2 files changed, 21 insertions, 2 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 1da7a333..48ed5783 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-14 Scott Deifik <scottd.mail@sbcglobal.net>
+
+ * Makefile.tst: Sync with mainline.
+
2013-03-10 Arnold D. Robbins <arnold@skeeve.com>
* config.h: Update by manually running make-config.bat steps.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 083b97d8..71d735d2 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -174,7 +174,7 @@ UNIX_TESTS = \
GAWK_EXT_TESTS = \
aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
backw badargs beginfile1 beginfile2 binmode1 charasbytes \
- clos1way delsub devfd devfd1 devfd2 dumpvars exit \
+ colonwarn clos1way delsub devfd devfd1 devfd2 dumpvars exit \
fieldwdth fpat1 fpat2 fpat3 fpatnull fsfwfs funlen \
functab1 functab2 functab3 \
fwtest fwtest2 fwtest3 \
@@ -983,12 +983,20 @@ testext::
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ testext.awk
readdir:
+ @if [ "`uname`" = Linux ] && [ "`stat -f . 2>/dev/null | awk 'NR == 2 { print $$NF }'`" = nfs ]; then \
+ echo This test may fail on GNU/Linux systems when run on an NFS filesystem.; \
+ echo If it does, try rerunning on an ext'[234]' filesystem. ; \
+ fi
@echo $@
@$(AWK) -f $(srcdir)/readdir.awk $(top_srcdir) > _$@
- @ls -fli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok
+ @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk -v extout=_$@ > $@.ok
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
+ @if [ "`uname`" = IRIX ]; then \
+ 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 $@
@$(AWK) -f $(srcdir)/fts.awk
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
@@ -1019,6 +1027,13 @@ reginttrad:
@echo $@
@$(AWK) --traditional -r -f $(srcdir)/$@.awk > _$@
@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
+colonwarn:
+ @echo $@
+ @for i in 1 2 3 ; \
+ do $(AWK) -f $(srcdir)/$@.awk $$i < $(srcdir)/$@.in ; \
+ done > _$@
+ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
Gt-dummy:
# file Maketests, generated from Makefile.am by the Gentests program
addcomma: