diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-11-28 22:32:58 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-11-28 22:32:58 +0200 |
| commit | 3d57145d559a321f54c1a7c8b269df4e0862938a (patch) | |
| tree | c19fcdc57357f18841600fb4086d6dd9020e0d6d /test | |
| parent | 5f7c3c807cb7e7f63925bb7d0c18ba3a1c0014c3 (diff) | |
| parent | 29c8a4a896c4de85f904bc3344a2fefe0b2f693d (diff) | |
| download | egawk-3d57145d559a321f54c1a7c8b269df4e0862938a.tar.gz egawk-3d57145d559a321f54c1a7c8b269df4e0862938a.tar.bz2 egawk-3d57145d559a321f54c1a7c8b269df4e0862938a.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/readdir0.awk | 6 |
4 files changed, 11 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 11460e71..4bead8c7 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 4eb41ab2..5133e134 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1814,7 +1814,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 3dc9d840..256ca484 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2209,7 +2209,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 |