diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-05-30 23:45:27 -0400 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-05-30 23:45:27 -0400 |
| commit | 22ea6af9c93cbbfce581a00c7a41b0c92fd8507d (patch) | |
| tree | 5646692c3310e7ea76073abb53e8d4b7a1b97875 /pc | |
| parent | 0b876113d778d77543fd8bafef4e37fc2af72bc8 (diff) | |
| parent | 501c2e5e720e3dbcb2e830c28037dd8b8d46bfcf (diff) | |
| download | egawk-22ea6af9c93cbbfce581a00c7a41b0c92fd8507d.tar.gz egawk-22ea6af9c93cbbfce581a00c7a41b0c92fd8507d.tar.bz2 egawk-22ea6af9c93cbbfce581a00c7a41b0c92fd8507d.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'pc')
| -rw-r--r-- | pc/ChangeLog | 8 | ||||
| -rw-r--r-- | pc/Makefile.tst | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index a9c7ec8e..fb44a486 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,11 @@ +2015-05-29 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.tst (negtime): Sync with mainline. + +2015-05-29 Scott Deifik <scottd.mail@sbcglobal.net> + + * Makefile.tst (dbugeval): Sync with mainline. + 2015-05-19 Arnold D. Robbins <arnold@skeeve.com> * 4.1.3: Release tar ball made. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index 8b7baa2b..a787563c 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -1201,8 +1201,10 @@ backsmalls2: dbugeval:: @echo $@ - @$(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @if [ -t 0 ]; then \ + $(AWK) --debug -f /dev/null < "$(srcdir)"/$@.in > _$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ; \ + fi printhuge:: @echo $@ @@ -1232,9 +1234,8 @@ paramasfunc2:: negtime:: @echo $@ - @echo Expect negtime to fail with MinGW and DJGPP @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk $@.ok _$@ && rm -f _$@ Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: |