diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2011-10-21 14:30:53 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2011-10-21 14:30:53 +0200 |
| commit | b93f884037cf5fb58029cb9108923609aa94dc2a (patch) | |
| tree | d0e7ce3800a3eb978c1b3e97fe6b688776e34337 | |
| parent | d45dee9add229d64ca875c11c78392e1a80dc100 (diff) | |
| download | egawk-b93f884037cf5fb58029cb9108923609aa94dc2a.tar.gz egawk-b93f884037cf5fb58029cb9108923609aa94dc2a.tar.bz2 egawk-b93f884037cf5fb58029cb9108923609aa94dc2a.zip | |
Fix beginfile2 for running outside of srcdir.
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rwxr-xr-x | test/beginfile2.sh | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 21224fd7..3685aefe 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2011-10-21 Corinna Vinschen <vinschen@redhat.com> + + * Makefile.am (beginfile2): Adjust for running out of srcdir. + * beginfile2.sh: Same. + 2011-10-02 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (rtlen, rtlen01, rtlenmb): New tests. diff --git a/test/Makefile.am b/test/Makefile.am index 57d4d464..33078813 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1390,7 +1390,7 @@ beginfile1:: beginfile2: @echo $@ - @-AWK="$(AWKPROG)" $(srcdir)/$@.sh $(srcdir)/$@.in > _$@ 2>&1 + @-( cd $(srcdir) && AWK="$(abs_builddir)/$(AWKPROG)" $(srcdir)/$@.sh $(srcdir)/$@.in ) > _$@ 2>&1 @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ dumpvars:: diff --git a/test/Makefile.in b/test/Makefile.in index e5ff2005..6ad2cdd0 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1741,7 +1741,7 @@ beginfile1:: beginfile2: @echo $@ - @-AWK="$(AWKPROG)" $(srcdir)/$@.sh $(srcdir)/$@.in > _$@ 2>&1 + @-( cd $(srcdir) && AWK="$(abs_builddir)/$(AWKPROG)" $(srcdir)/$@.sh $(srcdir)/$@.in ) > _$@ 2>&1 @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ dumpvars:: diff --git a/test/beginfile2.sh b/test/beginfile2.sh index 19deef62..abf9efe0 100755 --- a/test/beginfile2.sh +++ b/test/beginfile2.sh @@ -2,7 +2,7 @@ # beginfile2.sh --- test BEGINFILE/ENDFILE/getline/nextfile/exit combinations -AWK="../gawk" +#AWK="../gawk" AWKPROG="beginfile2.in" SCRIPT=`basename $0` |