diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-03-19 17:07:13 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-03-19 17:07:13 -0400 |
| commit | de684770acc545bf14f85655d44fe91e9afa0ba3 (patch) | |
| tree | c7041f00fd8de0fa25505bc19c3253f79655f674 | |
| parent | 3272a45617a6c6b58096e7e8349c7d5d63b910f6 (diff) | |
| parent | 1e9198f58d7d5616e03dc4b2bb6f738ab4e89f06 (diff) | |
| download | egawk-de684770acc545bf14f85655d44fe91e9afa0ba3.tar.gz egawk-de684770acc545bf14f85655d44fe91e9afa0ba3.tar.bz2 egawk-de684770acc545bf14f85655d44fe91e9afa0ba3.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 12 | ||||
| -rw-r--r-- | test/Makefile.in | 12 | ||||
| -rw-r--r-- | test/argarray.ok | 4 |
4 files changed, 15 insertions, 20 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index b0ca5a97..df0ed8fa 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2017-03-19 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (argarray): Always copy argarray.in to the local + directory as argarray.input instead of trying to figure out whether + $(srcdir) is the current directory. + * argarray.ok: Replace argarray.in with argarray.input. + 2017-02-21 Andrew J. Schorr <aschorr@telemetry-investments.com> * Makefile.am (mktime): New test. diff --git a/test/Makefile.am b/test/Makefile.am index 65336b6c..a356d63b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1461,15 +1461,9 @@ messages:: argarray:: @echo $@ - @case "$(srcdir)" in \ - .) : ;; \ - *) cp "$(srcdir)"/argarray.in . ;; \ - esac - @TEST=test echo just a test | $(AWK) -f "$(srcdir)"/argarray.awk ./argarray.in - >_$@ - @case "$(srcdir)" in \ - .) : ;; \ - *) rm -f ./argarray.in ;; \ - esac + @cp "$(srcdir)"/argarray.in ./argarray.input + @TEST=test echo just a test | $(AWK) -f "$(srcdir)"/argarray.awk ./argarray.input - >_$@ + @rm -f ./argarray.input @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ regtest:: diff --git a/test/Makefile.in b/test/Makefile.in index 1a61996f..8719840b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1901,15 +1901,9 @@ messages:: argarray:: @echo $@ - @case "$(srcdir)" in \ - .) : ;; \ - *) cp "$(srcdir)"/argarray.in . ;; \ - esac - @TEST=test echo just a test | $(AWK) -f "$(srcdir)"/argarray.awk ./argarray.in - >_$@ - @case "$(srcdir)" in \ - .) : ;; \ - *) rm -f ./argarray.in ;; \ - esac + @cp "$(srcdir)"/argarray.in ./argarray.input + @TEST=test echo just a test | $(AWK) -f "$(srcdir)"/argarray.awk ./argarray.input - >_$@ + @rm -f ./argarray.input @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ regtest:: diff --git a/test/argarray.ok b/test/argarray.ok index 18eb841c..3c026634 100644 --- a/test/argarray.ok +++ b/test/argarray.ok @@ -1,9 +1,9 @@ here we have 3 arguments which are gawk - ./argarray.in + ./argarray.input - Environment variable TEST= and the current input file is called "" -in main loop, this input file is known as "./argarray.in" +in main loop, this input file is known as "./argarray.input" in main loop, this input file is known as "-" |