diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-05-02 22:47:49 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-05-02 22:47:49 +0300 |
| commit | 800d8dfddf14399e2b6470ef8b0d2b4d30398b2c (patch) | |
| tree | a1dd2fac527632700b0edf45db04f0963c805b56 | |
| parent | 362a751010463c8c0b897d80e1b83abf3f62374b (diff) | |
| download | egawk-800d8dfddf14399e2b6470ef8b0d2b4d30398b2c.tar.gz egawk-800d8dfddf14399e2b6470ef8b0d2b4d30398b2c.tar.bz2 egawk-800d8dfddf14399e2b6470ef8b0d2b4d30398b2c.zip | |
Fix symtab9 test so it will work on Windows too.
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.in | 11 | ||||
| -rw-r--r-- | test/Maketests | 5 | ||||
| -rw-r--r-- | test/symtab9.awk | 6 |
5 files changed, 22 insertions, 11 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index a5df1760..70bf81bd 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2013-05-02 Arnold D. Robbins <arnold@skeeve.com> + + * symtab9.awk: Don't remove test file in END rule, breaks on Windows. + * Makefile.am (symtab9): Add explicit rule and remove test file file. + 2013-04-19 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (LOCALES): New variable split out from AWK. diff --git a/test/Makefile.am b/test/Makefile.am index 75e0c6ef..4376691a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1793,6 +1793,12 @@ symtab8: @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' | grep -v '^FILENAME' >> _$@ ; rm __$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +symtab9: + @echo $@ + @$(AWK) -f $(srcdir)/$@.awk >_$@ + @rm -f testit.txt + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + reginttrad: @echo $@ @$(AWK) --traditional -r -f $(srcdir)/$@.awk > _$@ diff --git a/test/Makefile.in b/test/Makefile.in index 71b263b1..46e7f57a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2187,6 +2187,12 @@ symtab8: @grep -v '^ENVIRON' __$@ | grep -v '^PROCINFO' | grep -v '^FILENAME' >> _$@ ; rm __$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ +symtab9: + @echo $@ + @$(AWK) -f $(srcdir)/$@.awk >_$@ + @rm -f testit.txt + @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ + reginttrad: @echo $@ @$(AWK) --traditional -r -f $(srcdir)/$@.awk > _$@ @@ -3417,11 +3423,6 @@ symtab7: @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ -symtab9: - @echo $@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - double1: @echo $@ @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/Maketests b/test/Maketests index 18564204..d0346a8b 100644 --- a/test/Maketests +++ b/test/Maketests @@ -1217,11 +1217,6 @@ symtab7: @AWKPATH=$(srcdir) $(AWK) -f $@.awk < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ -symtab9: - @echo $@ - @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@ - double1: @echo $@ @AWKPATH=$(srcdir) $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ diff --git a/test/symtab9.awk b/test/symtab9.awk index fd8f14d9..6b520147 100644 --- a/test/symtab9.awk +++ b/test/symtab9.awk @@ -11,5 +11,9 @@ BEGIN { getline printf "NR should be 3, is %d\n", SYMTAB["NR"] - system("rm testit.txt") + + # Can't do this here. Windows doesn't let you remove a file that + # is still open. Moving it to END won't help either, since the file + # (correctly) remain open until after the END finishes. + # system("rm testit.txt") } |