From 6c20cf0710ef99d0c9b2c1622b18867311cbe78b Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 22 Aug 2011 08:43:22 +0200 Subject: [PATCH] tap/awk: support Solaris /usr/bin/nawk * lib/tap-driver.sh (close_or_die): Remove, the use of the `close' builtin in there was confusing /usr/bin/nawk from Solaris 10 into a syntax error. (write_test_results): Simply use `close' on the `*.trs' file, that should be enough. --- ChangeLog | 9 +++++++++ lib/tap-driver.sh | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 738e10ff8..ac143d475 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-08-22 Stefano Lattarini + + tap/awk: support Solaris /usr/bin/nawk + * lib/tap-driver.sh (close_or_die): Remove, the use of the `close' + builtin in there was confusing /usr/bin/nawk from Solaris 10 into + a syntax error. + (write_test_results): Simply use `close' on the `*.trs' file, that + should be enough. + 2011-08-21 Stefano Lattarini tap/awk: correctly extract message from SKIP plans diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh index dd2b92945..60190b8de 100755 --- a/lib/tap-driver.sh +++ b/lib/tap-driver.sh @@ -155,12 +155,6 @@ function abort(where) fatal("internal error " where) } -function close_or_die(fpath, fname) -{ - if (close(fpath) != 0) - fatal(sprintf("could not close %s \"%s\"", fname, fpath)) -} - # Convert a boolean to a "yes"/"no" string. function yn(bool) { @@ -429,7 +423,7 @@ function write_test_results() print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file for (i = 0; i < test_results_index; i += 1) print ":test-result: " test_results_list[i] > trs_file - close_or_die(trs_file, "trs file"); + close(trs_file); } ## ------- ## -- 2.47.2