aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog8
-rw-r--r--test/Makefile.am11
-rw-r--r--test/Makefile.in11
3 files changed, 20 insertions, 10 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 680954ed..6b02c6a1 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-28 Andrew J. Schorr <aschorr@telemetry-investments.com>
+
+ * Makefile.am (EXTRA_DIST): Add jarebug.sh.
+ (readdir): Use standard output filenames readdir.ok and _readdir
+ instead of readdir.out1 and readdir.out2. The standard names are
+ required for the pass-fail and diffout rules to work correctly.
+ (clean): Remove readdir.ok
+
2012-08-26 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (charasbytes): Revise test to canonicalize
diff --git a/test/Makefile.am b/test/Makefile.am
index 5f62852d..60b50a87 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -408,6 +408,7 @@ EXTRA_DIST = \
jarebug.awk \
jarebug.in \
jarebug.ok \
+ jarebug.sh \
lc_num1.awk \
lc_num1.ok \
leaddig.awk \
@@ -1647,10 +1648,10 @@ assignconst:
readdir:
@echo $@
- @touch $@.out1 $@.out2 # create directory entries first
- @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.out1
- @$(AWK) -f $(srcdir)/readdir.awk . > $@.out2
- @-$(CMP) $@.out1 $@.out2 && rm -f $@.out[12]
+ @touch $@.ok _$@ # create directory entries first
+ @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.ok
+ @$(AWK) -f $(srcdir)/readdir.awk . > _$@
+ @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
@echo $@
@@ -1672,7 +1673,7 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
clean:
- rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2
+ rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2 readdir.ok
# An attempt to print something that can be grepped for in build logs
pass-fail:
diff --git a/test/Makefile.in b/test/Makefile.in
index 35c7b201..4cda1d44 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -620,6 +620,7 @@ EXTRA_DIST = \
jarebug.awk \
jarebug.in \
jarebug.ok \
+ jarebug.sh \
lc_num1.awk \
lc_num1.ok \
leaddig.awk \
@@ -2029,10 +2030,10 @@ assignconst:
readdir:
@echo $@
- @touch $@.out1 $@.out2 # create directory entries first
- @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.out1
- @$(AWK) -f $(srcdir)/readdir.awk . > $@.out2
- @-$(CMP) $@.out1 $@.out2 && rm -f $@.out[12]
+ @touch $@.ok _$@ # create directory entries first
+ @ls -fli | sed 1d | $(AWK) -f $(srcdir)/readdir0.awk > $@.ok
+ @$(AWK) -f $(srcdir)/readdir.awk . > _$@
+ @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@
fts:
@echo $@
@@ -3315,7 +3316,7 @@ $(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests
$(AWK) -f $(srcdir)/Gentests "$(srcdir)/Makefile.am" $$files > $(srcdir)/Maketests
clean:
- rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2
+ rm -fr _* core core.* fmtspcl.ok junk out1 out2 out3 strftime.ok test1 test2 seq *~ readfile.ok fork.tmp.* testext.awk fts.out1 fts.out2 readdir.ok
# An attempt to print something that can be grepped for in build logs
pass-fail: