diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2011-10-21 15:00:42 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2011-10-21 15:00:42 +0200 |
| commit | 54b630ec92718b620e53997958003ea978fb9006 (patch) | |
| tree | eda1f840fb2f68f1be0acd991a50ee57e05831d7 | |
| parent | afc57f3db63c875d7cacbb2d69482558ef536ee7 (diff) | |
| download | gawk-54b630ec92718b620e53997958003ea978fb9006.tar.gz | |
More fixes to beginfile2.
| -rw-r--r-- | test/ChangeLog | 4 | ||||
| -rw-r--r-- | test/beginfile2.in | 4 | ||||
| -rw-r--r-- | test/beginfile2.ok | 9 | ||||
| -rwxr-xr-x | test/beginfile2.sh | 4 |
4 files changed, 14 insertions, 7 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 3685aefe..91be7d04 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +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. 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 abf9efe0..9310ba81 100755 --- a/test/beginfile2.sh +++ b/test/beginfile2.sh @@ -24,11 +24,11 @@ $AWK "$prog" $AWKPROG /file/does/not/exist echo "--Test 3--" prog=$($AWK '/#TEST3#/, /#TEST4#/' $AWKPROG) -$AWK "$prog" $AWKPROG +$AWK -vsrc=$SCRIPT "$prog" $AWKPROG echo "--Test 4--" prog=$($AWK '/#TEST4#/, /#TEST5#/' $AWKPROG) -$AWK "$prog" $AWKPROG +$AWK -vsrc=$SCRIPT "$prog" $AWKPROG echo "--Test 5--" prog=$($AWK '/#TEST5#/, /#TEST6#/' $AWKPROG) |