diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2013-11-27 16:58:33 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2013-11-27 16:58:33 -0500 |
| commit | 8dff22eea28d6d782b2de14fb1ecaf93a2031c8b (patch) | |
| tree | 1ef15127dab35cbe8a331843d8d022481a6d466d /test | |
| parent | d3f39dfac79cf1a3fd6ad36b29dbebd88447bd1a (diff) | |
| parent | 7e7f5610683ea455b6d40297b0c3cd11156006da (diff) | |
| download | egawk-8dff22eea28d6d782b2de14fb1ecaf93a2031c8b.tar.gz egawk-8dff22eea28d6d782b2de14fb1ecaf93a2031c8b.tar.bz2 egawk-8dff22eea28d6d782b2de14fb1ecaf93a2031c8b.zip | |
Merge branch 'gawk-4.1-stable' to fix readdir test.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/readdir0.awk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 6d54591a..11460e71 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,5 +1,10 @@ 2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + * readdir0.awk: Restore fix so that we do not fail on filesysystems + such as XFS where the dirent does not contain the file type. + +2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com> + * Makefile.am (ordchr2): Use --load instead of -l to make sure the long option works properly. Note that the readfile test still uses the short version. diff --git a/test/readdir0.awk b/test/readdir0.awk index f16f4818..5aedbf70 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -41,5 +41,5 @@ BEGIN { printf("mismatch: %d from `ls -afi' and %d from `ls -l'\n", i, j) > "/dev/stderr" for (i = 1; i in names; i++) - printf("%s/%s/%s\n", ino[names[i]], names[i], type[names[i]]) + printf("%s/%s/%s\n", ino[names[i]], names[i], (ftype_unknown ? "u" : type[names[i]])) } |