diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-06-08 09:51:47 -0400 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-06-08 09:51:47 -0400 |
| commit | a6568baf060045cadad1f05af5cfe43e31626b31 (patch) | |
| tree | 4471355f7fc25c1549a915a03ab8b14fbeb8783d /pc | |
| parent | c70ee2ae9fc9fa99c0b3b1af20a7dd0203aaa0d1 (diff) | |
| parent | 72882c6a1e76730e6e706941a1a3a855ea023b69 (diff) | |
| download | egawk-a6568baf060045cadad1f05af5cfe43e31626b31.tar.gz egawk-a6568baf060045cadad1f05af5cfe43e31626b31.tar.bz2 egawk-a6568baf060045cadad1f05af5cfe43e31626b31.zip | |
Merge branch 'master' into feature/cmake
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: |