diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 15 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 3 | ||||
| -rw-r--r-- | test/beginfile2.in | 4 | ||||
| -rw-r--r-- | test/beginfile2.ok | 9 | ||||
| -rwxr-xr-x | test/beginfile2.sh | 38 |
6 files changed, 44 insertions, 27 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 21224fd7..05a74f87 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,18 @@ +2011-10-24 Arnold D. Robbins <arnold@skeeve.com> + + * beginfile2.sh: Use `...` instead of $(...) for broken systems + where /bin/sh doesn't support $(...). Thanks to Nelson Beebe for + the report. + +2011-10-21 John Haque <j.eh@mchsi.com> + + * beginfile2.in, beginfile2.sh, beginfile2.ok: Adjust input file names. + +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 92e5d1b6..450fc35d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1391,7 +1391,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 886e22c0..91173ea5 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -150,7 +150,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOCKET_LIBS = @SOCKET_LIBS@ STRIP = @STRIP@ -U = @U@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ @@ -1742,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.in b/test/beginfile2.in index 5b7cc833..34043e72 100644 --- a/test/beginfile2.in +++ b/test/beginfile2.in @@ -26,7 +26,7 @@ BEGINFILE { } END { print "executing END rule" - ARGV[ARGC++] = "beginfile.sh"; + ARGV[ARGC++] = src; count = 0 while (getline> 0) count++; @@ -44,7 +44,7 @@ BEGINFILE { } END { print "executing END rule" - ARGV[ARGC++] = "beginfile.sh"; + ARGV[ARGC++] = src; getline print $0 print "Done executing END rule" diff --git a/test/beginfile2.ok b/test/beginfile2.ok index c3029c7c..2d872eae 100644 --- a/test/beginfile2.ok +++ b/test/beginfile2.ok @@ -15,13 +15,16 @@ In BEGINFILE: /file/does/not/exist In BEGINFILE: beginfile2.in In ENDFILE: beginfile2.in executing END rule -In BEGINFILE: beginfile.sh -gawk: cmd. line:3: fatal: cannot open file `beginfile.sh' for reading (No such file or directory) +In BEGINFILE: beginfile2.sh +In ENDFILE: beginfile2.sh +1 +Done executing END rule --Test 4-- In BEGINFILE: beginfile2.in ENDFILE: beginfile2.in executing END rule -In BEGINFILE: beginfile.sh +In BEGINFILE: beginfile2.sh +ENDFILE: beginfile2.sh Done executing END rule --Test 5-- diff --git a/test/beginfile2.sh b/test/beginfile2.sh index 19deef62..69161200 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` @@ -13,70 +13,70 @@ then fi echo "--Test 1a--" -prog=$($AWK '/#TEST1#/, /#TEST2#/' $AWKPROG) +prog=`$AWK '/#TEST1#/, /#TEST2#/' $AWKPROG` $AWK "$prog" $AWKPROG echo "--Test 1b--" $AWK "$prog" $AWKPROG /file/does/not/exist echo "--Test 2--" -prog=$($AWK '/#TEST2#/, /#TEST3#/' $AWKPROG) +prog=`$AWK '/#TEST2#/, /#TEST3#/' $AWKPROG` $AWK "$prog" $AWKPROG /file/does/not/exist echo "--Test 3--" -prog=$($AWK '/#TEST3#/, /#TEST4#/' $AWKPROG) -$AWK "$prog" $AWKPROG +prog=`$AWK '/#TEST3#/, /#TEST4#/' $AWKPROG` +$AWK -vsrc=$SCRIPT "$prog" $AWKPROG echo "--Test 4--" -prog=$($AWK '/#TEST4#/, /#TEST5#/' $AWKPROG) -$AWK "$prog" $AWKPROG +prog=`$AWK '/#TEST4#/, /#TEST5#/' $AWKPROG` +$AWK -vsrc=$SCRIPT "$prog" $AWKPROG echo "--Test 5--" -prog=$($AWK '/#TEST5#/, /#TEST6#/' $AWKPROG) +prog=`$AWK '/#TEST5#/, /#TEST6#/' $AWKPROG` $AWK "$prog" $AWKPROG echo "--Test 6--" -prog=$($AWK '/#TEST6#/, /#TEST7#/' $AWKPROG) +prog=`$AWK '/#TEST6#/, /#TEST7#/' $AWKPROG` $AWK "$prog" $AWKPROG echo "--Test 7--" -prog=$($AWK '/#TEST7#/, /#TEST8#/' $AWKPROG) +prog=`$AWK '/#TEST7#/, /#TEST8#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 8--" -prog=$($AWK '/#TEST8#/, /#TEST9#/' $AWKPROG) +prog=`$AWK '/#TEST8#/, /#TEST9#/' $AWKPROG` $AWK "$prog" $AWKPROG echo "--Test 9a--" -prog=$($AWK '/#TEST9#/, /#TEST10#/' $AWKPROG) +prog=`$AWK '/#TEST9#/, /#TEST10#/' $AWKPROG` $AWK "$prog" /file/does/not/exist $AWKPROG echo "--Test 9b--" $AWK -vskip=1 "$prog" /file/does/not/exist $AWKPROG echo "--Test 10--" -prog=$($AWK '/#TEST10#/, /#TEST11#/' $AWKPROG) +prog=`$AWK '/#TEST10#/, /#TEST11#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 11--" -prog=$($AWK '/#TEST11#/, /#TEST12#/' $AWKPROG) +prog=`$AWK '/#TEST11#/, /#TEST12#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 12--" -prog=$($AWK '/#TEST12#/, /#TEST13#/' $AWKPROG) +prog=`$AWK '/#TEST12#/, /#TEST13#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 13--" -prog=$($AWK '/#TEST13#/, /#TEST14#/' $AWKPROG) +prog=`$AWK '/#TEST13#/, /#TEST14#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 14--" -prog=$($AWK '/#TEST14#/, /#TEST15#/' $AWKPROG) +prog=`$AWK '/#TEST14#/, /#TEST15#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 15--" -prog=$($AWK '/#TEST15#/, /#TEST16#/' $AWKPROG) +prog=`$AWK '/#TEST15#/, /#TEST16#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT echo "--Test 16--" -prog=$($AWK '/#TEST16#/, /#TEST17#/' $AWKPROG) +prog=`$AWK '/#TEST16#/, /#TEST17#/' $AWKPROG` $AWK "$prog" $AWKPROG $SCRIPT |