summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2013-11-28 22:27:47 +0200
committerArnold D. Robbins <arnold@skeeve.com>2013-11-28 22:27:47 +0200
commit44164e59a0398e5ffc2e7f5519c295aad2df6655 (patch)
treed2e133f2ee78218010cfdac8b77d3f6504f6d89d /test
parenteac9994fe3f765848d7815bb32ece216cd3a7cac (diff)
downloadgawk-44164e59a0398e5ffc2e7f5519c295aad2df6655.tar.gz
Make 'make distcheck' work.
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.in2
-rw-r--r--test/readdir0.awk6
4 files changed, 11 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 50f10ad7..ccdeaa0b 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-28 Arnold D. Robbins <arnold@skeeve.com>
+
+ * readdir0.awk: Take argument which is directory to read.
+ * Makefile.am (readdir): Pass $(top_srcdir) to readdir0.awk.
+
2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com>
* readdir0.awk: Restore fix so that we do not fail on filesysystems
diff --git a/test/Makefile.am b/test/Makefile.am
index 892f8657..0562f536 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1812,7 +1812,7 @@ readdir:
fi
@echo $@
@$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@
- @ls -afli $(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=_$@ $(top_srcdir) > $@.ok
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
diff --git a/test/Makefile.in b/test/Makefile.in
index d34a42d2..aa23dc4b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2207,7 +2207,7 @@ readdir:
fi
@echo $@
@$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@
- @ls -afli $(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=_$@ $(top_srcdir) > $@.ok
@-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
diff --git a/test/readdir0.awk b/test/readdir0.awk
index 5aedbf70..296c03c7 100644
--- a/test/readdir0.awk
+++ b/test/readdir0.awk
@@ -12,8 +12,10 @@ BEGIN {
}
BEGIN {
- ls_afi = "ls -afi .."
- ls_al = "ls -lna .. | sed 1d"
+ dir = ARGV[1]
+ delete ARGV[1]
+ ls_afi = "ls -afi " dir
+ ls_al = ("ls -lna " dir " | sed 1d")
for (i = 1; (ls_afi | getline) > 0; i++) {
# inode number is $1, filename is read of record