- Pacman-contrib - lists.archlinux.org

[GIT] branch master updated (4e2273e -> 58bfa06)
by Johannes Löthberg 08 Aug '19

08 Aug '19

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 4e2273e doc/checkupdates.8.txt: Update with -d option new 58bfa06 paclist: Allow listing packages from multiple repos at once The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 58bfa06 (HEAD -> master) paclist: Allow listing packages from multiple repos at once Detailed log of new commits: commit 58bfa067934a0ec07aa4612594a993984ba90193 Author: Lars Rustand <rustand.lars(a)gmail.com> Date: Thu Aug 8 07:20:34 2019 +0200 paclist: Allow listing packages from multiple repos at once Signed-off-by: Lars Rustand <rustand.lars(a)gmail.com> Message-Id: <20190808052034.4950-1-rustand.lars(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/paclist.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] paclist: Allow listing packages from multiple repos at once
by Lars Rustand 04 Aug '19

04 Aug '19

Signed-off-by: Lars Rustand <rustand.lars(a)gmail.com> --- src/paclist.sh.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/paclist.sh.in b/src/paclist.sh.in index efd47af..4fd7e5e 100644 --- a/src/paclist.sh.in +++ b/src/paclist.sh.in @@ -25,7 +25,7 @@ usage() { echo printf "List all packages installed from a given repository\n" "${myname}" echo - printf "Usage: %s <repository>\n" "${myname}" + printf "Usage: %s <repository> ...\n" "${myname}" echo printf "Example: %s testing\n" "${myname}" } @@ -49,8 +49,10 @@ elif [[ $1 = -@(V|-version) ]]; then exit 0 fi -pacman -Sl $1 | awk '/\[.*[[:alpha:]]+]$/ {print $2,$3}; - /\[.*[[:digit:]]+]$/ {print $2,substr($NF, 1, length($NF) - 1)}' +for repo in "$@"; do + pacman -Sl $repo | awk '/\[.*[[:alpha:]]+]$/ {print $2,$3}; + /\[.*[[:digit:]]+]$/ {print $2,substr($NF, 1, length($NF) - 1)}' +done # exit with pacman's return value, not awk's exit ${PIPESTATUS[0]} -- 2.22.0

2 1

[PATCH 1/2] checkupdates: add -q/--quiet
by morganamilo 28 Jun '19

28 Jun '19

diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index 0885983..024243c 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -22,6 +22,7 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' DOWNLOAD_CACHE=0 +QUIET=0 m4_include(../lib/output_format.sh) m4_include(../lib/term_colors.sh) @@ -38,14 +39,15 @@ Usage: ${myname} [options] Options: -d, --download download pending updates to the pacman cache. -h, --help display this help message and exit. + -q, --quiet only display pkgnames. Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database. __EOF__ } -OPT_SHORT='dh' -OPT_LONG=('download' 'help') +OPT_SHORT='dhq' +OPT_LONG=('download' 'help' 'quiet') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 @@ -60,6 +62,8 @@ while :; do -h|--help) usage exit 0 ;; + -q|--quiet) + QUIET=1 ;; --) shift break ;; @@ -92,6 +96,9 @@ fi mapfile -t updates < <(pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]') if (( ${#updates[@]} )); then + if (( $QUIET )); then + updates=("${updates[@]%% *}") + fi printf '%s\n' "${updates[@]}" if (( DOWNLOAD_CACHE )); then sudo pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null -- 2.22.0

2 3

[GIT] branch master updated (28730f8 -> 4e2273e)
by Daniel M. Capella 26 Apr '19

26 Apr '19

This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from 28730f8 checkupdates: Fix indentation new 4e2273e doc/checkupdates.8.txt: Update with -d option The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 4e2273e (HEAD -> master) doc/checkupdates.8.txt: Update with -d option Detailed log of new commits: commit 4e2273e2fe76423332da72efaa03ea374a716124 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Apr 24 21:33:55 2019 +0200 doc/checkupdates.8.txt: Update with -d option Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: doc/checkupdates.8.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] doc/checkupdates.8.txt: Update with -d option
by Johannes Löthberg 24 Apr '19

24 Apr '19

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- doc/checkupdates.8.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/checkupdates.8.txt b/doc/checkupdates.8.txt index e7c5a92..ff10930 100644 --- a/doc/checkupdates.8.txt +++ b/doc/checkupdates.8.txt @@ -11,7 +11,7 @@ checkupdates - safely print a list of pending updates Synopsis -------- -'checkupdates' +'checkupdates' [options] Description @@ -21,6 +21,15 @@ Checks for pending updates using a separate Pacman database located in old and new version. +Options +------- +*-d, \--download*:: + Download any pending updates to the pacman cache. + +*-h, \--help*:: + Display syntax and command line options. + + Environment ----------- *CHECKUPDATES_DB*:: -- 2.21.0

1 0

[GIT] branch master updated (fc21909 -> 28730f8)
by Johannes Löthberg 24 Apr '19

24 Apr '19

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from fc21909 vim: add syntax for b2sums, recently added to makepkg new 28730f8 checkupdates: Fix indentation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 28730f8 (HEAD -> master) checkupdates: Fix indentation Detailed log of new commits: commit 28730f8a5fe264dbdef1353f4ca277990a31ffdf Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Apr 24 21:31:51 2019 +0200 checkupdates: Fix indentation Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/checkupdates.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] branch master updated (c57d275 -> fc21909)
by Johannes Löthberg 24 Apr '19

24 Apr '19

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from c57d275 term_colors.sh: do not use colors on a dumb term new cbe6558 autotools: remove useless file from the source tree new ab69666 checkupdates: add option to download updates using -Swu new fc21909 vim: add syntax for b2sums, recently added to makepkg The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * fc21909 (HEAD -> master) vim: add syntax for b2sums, recently added to makepkg * ab69666 checkupdates: add option to download updates using -Swu * cbe6558 autotools: remove useless file from the source tree Detailed log of new commits: commit fc21909ba2982a4225d86c4a0f9e354fe74961ad Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Apr 16 22:49:42 2019 -0400 vim: add syntax for b2sums, recently added to makepkg Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Message-Id: <20190417024942.19420-2-eschwartz(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit ab696663975c433c451d9927f907a67a14441263 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Apr 24 13:44:43 2019 -0400 checkupdates: add option to download updates using -Swu This is safer than -Sywu, and should be included here for the same reason we wish to encourage people not to use -Sy && -Qu. Since an option was added, we now need option parsing, so I converted over to using parseopts. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Message-Id: <20190424174444.25275-1-eschwartz(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit cbe65585f47860ab325624de7020c816813010c3 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Apr 16 22:46:31 2019 -0400 autotools: remove useless file from the source tree tap-driver.sh is a generated file, it is installed by autoreconf because configure.ac says to install it. There's no reason to keep a copy checked into git, and by tracking it, users end up with dirty trees just because they attempted to build the project. This prevents convenient use of various git features. Its presence in git is most likely an accident. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Message-Id: <20190417024631.19259-1-eschwartz(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: build-aux/tap-driver.sh | 652 -------------------------------------------- src/checkupdates.sh.in | 61 ++++- src/vim/syntax/PKGBUILD.vim | 11 + 3 files changed, 61 insertions(+), 663 deletions(-) delete mode 100755 build-aux/tap-driver.sh -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH 1/2] updpkgsums: rely on makepkg's exported schema declaration for algo types
by Eli Schwartz 24 Apr '19

24 Apr '19

Rather than heuristically match (md|sha)[[:digit:]]+sums or even .*sums, read makepkg's internal description of known hash algorithms, and use it to generate a search pattern. This ensures that we will always be in sync with the makepkg installed on the user's system. Fixes support for the newly added b2sums algorithm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- This depends on pacman from git master, because schema.sh does not exist in pacman 5.1.x src/updpkgsums.sh.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/updpkgsums.sh.in b/src/updpkgsums.sh.in index 9c545ea..618f471 100644 --- a/src/updpkgsums.sh.in +++ b/src/updpkgsums.sh.in @@ -22,6 +22,11 @@ shopt -s extglob declare -r myname='updpkgsums' declare -r myver='@PACKAGE_VERSION@' +LIBRARY=${LIBRARY:-'@datarootdir@/makepkg'} + +# Import libmakepkg +source "$LIBRARY"/util/schema.sh + usage() { printf "%s v%s\n" "${myname}" "${myver}" echo @@ -92,9 +97,10 @@ export BUILDDIR=$(mktemp -d "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX") trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT +sumtypes=$(IFS='|'; echo "${known_hash_algos[*]}") newsums=$(makepkg -g -p "$buildfile" "${MAKEPKG_OPTS[@]}") || die 'Failed to generate new checksums' -awk -v newsums="$newsums" ' - /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { +awk -v sumtypes="$sumtypes" -v newsums="$newsums" ' + $0 ~"^[[:blank:]]*(" sumtypes ")sums(_[^=]+)?=", $0 ~ "\)[[:blank:]]*(#.*)?$" { if (!w) { print newsums w++ -- 2.21.0

2 4

[pacman-contrib] [PATCH] checkupdates: add option to download updates using -Swu
by Eli Schwartz 24 Apr '19

24 Apr '19

This is safer than -Sywu, and should be included here for the same reason we wish to encourage people not to use -Sy && -Qu. Since an option was added, we now need option parsing, so I converted over to using parseopts. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- requires libmakepkg port src/checkupdates.sh.in | 64 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index 1d01fda..ed7cf28 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -21,19 +21,54 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' +LIBRARY=${LIBRARY:-'@datarootdir@/makepkg'} + +DOWNLOAD_CACHE=0 + m4_include(../lib/output_format.sh) m4_include(../lib/term_colors.sh) +# Import libmakepkg +source "$LIBRARY"/util/parseopts.sh + +usage() { + cat << __EOF__ +${myname} v${myver} + +Safely print a list of pending updates + +Usage: ${myname} [options] + + Options: + -d, --download download pending updates to the pacman cache. + -h, --help display this help message and exit. + +Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database. -if (( $# > 0 )); then - echo "${myname} v${myver}" - echo - echo "Safely print a list of pending updates" - echo - echo "Usage: ${myname}" - echo - echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' - exit 0 +__EOF__ +} + +OPT_SHORT='dh' +OPT_LONG=('download' 'help') + +if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then + exit 1 fi +set -- "${OPTRET[@]}" +unset OPT_SHORT OPT_LONG OPTRET + +while :; do + case $1 in + -d|--download) + DOWNLOAD_CACHE=1 ;; + -h|--help) + usage + exit 0 ;; + --) + shift + break ;; + esac + shift +done if ! type -P fakeroot >/dev/null; then error 'Cannot find the fakeroot binary.' @@ -57,8 +92,15 @@ if ! fakeroot -- pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> / error 'Cannot fetch updates' exit 1 fi -pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]' +mapfile -t updates < <(pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]') -exit 0 +if (( ${#updates[@]} )); then + printf '%s\n' "${updates[@]}" + if (( DOWNLOAD_CACHE )); then + sudo pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null + fi +else + exit 1 +fi # vim: set noet: -- 2.21.0

2 2

[pacman-contrib] [PATCH] autotools: remove useless file from the source tree
by Eli Schwartz 24 Apr '19

24 Apr '19

tap-driver.sh is a generated file, it is installed by autoreconf because configure.ac says to install it. There's no reason to keep a copy checked into git, and by tracking it, users end up with dirty trees just because they attempted to build the project. This prevents convenient use of various git features. Its presence in git is most likely an accident. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- build-aux/tap-driver.sh | 652 ---------------------------------------- 1 file changed, 652 deletions(-) delete mode 100755 build-aux/tap-driver.sh diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh deleted file mode 100755 index 19aa531..0000000 --- a/build-aux/tap-driver.sh +++ /dev/null @@ -1,652 +0,0 @@ -#! /bin/sh -# Copyright (C) 2011-2013 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -scriptversion=2011-12-27.17; # UTC - -# Make unconditional expansion of undefined variables an error. This -# helps a lot in preventing typo-related bugs. -set -u - -me=tap-driver.sh - -fatal () -{ - echo "$me: fatal: $*" >&2 - exit 1 -} - -usage_error () -{ - echo "$me: $*" >&2 - print_usage >&2 - exit 2 -} - -print_usage () -{ - cat <<END -Usage: - tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--ignore-exit] - [--diagnostic-string=STRING] [--merge|--no-merge] - [--comments|--no-comments] [--] TEST-COMMAND -The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory. -END -} - -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). -test_name= # Used for reporting. -log_file= # Where to save the result and output of the test script. -trs_file= # Where to save the metadata of the test run. -expect_failure=0 -color_tests=0 -merge=0 -ignore_exit=0 -comments=0 -diag_string='#' -while test $# -gt 0; do - case $1 in - --help) print_usage; exit $?;; - --version) echo "$me $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) shift;; # No-op. - --merge) merge=1;; - --no-merge) merge=0;; - --ignore-exit) ignore_exit=1;; - --comments) comments=1;; - --no-comments) comments=0;; - --diagnostic-string) diag_string=$2; shift;; - --) shift; break;; - -*) usage_error "invalid option: '$1'";; - esac - shift -done - -test $# -gt 0 || usage_error "missing test command" - -case $expect_failure in - yes) expect_failure=1;; - *) expect_failure=0;; -esac - -if test $color_tests = yes; then - init_colors=' - color_map["red"]="[0;31m" # Red. - color_map["grn"]="[0;32m" # Green. - color_map["lgn"]="[1;32m" # Light green. - color_map["blu"]="[1;34m" # Blue. - color_map["mgn"]="[0;35m" # Magenta. - color_map["std"]="[m" # No color. - color_for_result["ERROR"] = "mgn" - color_for_result["PASS"] = "grn" - color_for_result["XPASS"] = "red" - color_for_result["FAIL"] = "red" - color_for_result["XFAIL"] = "lgn" - color_for_result["SKIP"] = "blu"' -else - init_colors='' -fi - -# :; is there to work around a bug in bash 3.2 (and earlier) which -# does not always set '$?' properly on redirection failure. -# See the Autoconf manual for more details. -:;{ - ( - # Ignore common signals (in this subshell only!), to avoid potential - # problems with Korn shells. Some Korn shells are known to propagate - # to themselves signals that have killed a child process they were - # waiting for; this is done at least for SIGINT (and usually only for - # it, in truth). Without the `trap' below, such a behaviour could - # cause a premature exit in the current subshell, e.g., in case the - # test command it runs gets terminated by a SIGINT. Thus, the awk - # script we are piping into would never seen the exit status it - # expects on its last input line (which is displayed below by the - # last `echo $?' statement), and would thus die reporting an internal - # error. - # For more information, see the Autoconf manual and the threads: - # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html> - # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-Februa…> - trap : 1 3 2 13 15 - if test $merge -gt 0; then - exec 2>&1 - else - exec 2>&3 - fi - "$@" - echo $? - ) | LC_ALL=C ${AM_TAP_AWK-awk} \ - -v me="$me" \ - -v test_script_name="$test_name" \ - -v log_file="$log_file" \ - -v trs_file="$trs_file" \ - -v expect_failure="$expect_failure" \ - -v merge="$merge" \ - -v ignore_exit="$ignore_exit" \ - -v comments="$comments" \ - -v diag_string="$diag_string" \ -' -# FIXME: the usages of "cat >&3" below could be optimized when using -# FIXME: GNU awk, and/on on systems that supports /dev/fd/. - -# Implementation note: in what follows, `result_obj` will be an -# associative array that (partly) simulates a TAP result object -# from the `TAP::Parser` perl module. - -## ----------- ## -## FUNCTIONS ## -## ----------- ## - -function fatal(msg) -{ - print me ": " msg | "cat >&2" - exit 1 -} - -function abort(where) -{ - fatal("internal error " where) -} - -# Convert a boolean to a "yes"/"no" string. -function yn(bool) -{ - return bool ? "yes" : "no"; -} - -function add_test_result(result) -{ - if (!test_results_index) - test_results_index = 0 - test_results_list[test_results_index] = result - test_results_index += 1 - test_results_seen[result] = 1; -} - -# Whether the test script should be re-run by "make recheck". -function must_recheck() -{ - for (k in test_results_seen) - if (k != "XFAIL" && k != "PASS" && k != "SKIP") - return 1 - return 0 -} - -# Whether the content of the log file associated to this test should -# be copied into the "global" test-suite.log. -function copy_in_global_log() -{ - for (k in test_results_seen) - if (k != "PASS") - return 1 - return 0 -} - -# FIXME: this can certainly be improved ... -function get_global_test_result() -{ - if ("ERROR" in test_results_seen) - return "ERROR" - if ("FAIL" in test_results_seen || "XPASS" in test_results_seen) - return "FAIL" - all_skipped = 1 - for (k in test_results_seen) - if (k != "SKIP") - all_skipped = 0 - if (all_skipped) - return "SKIP" - return "PASS"; -} - -function stringify_result_obj(result_obj) -{ - if (result_obj["is_unplanned"] || result_obj["number"] != testno) - return "ERROR" - - if (plan_seen == LATE_PLAN) - return "ERROR" - - if (result_obj["directive"] == "TODO") - return result_obj["is_ok"] ? "XPASS" : "XFAIL" - - if (result_obj["directive"] == "SKIP") - return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL; - - if (length(result_obj["directive"])) - abort("in function stringify_result_obj()") - - return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL -} - -function decorate_result(result) -{ - color_name = color_for_result[result] - if (color_name) - return color_map[color_name] "" result "" color_map["std"] - # If we are not using colorized output, or if we do not know how - # to colorize the given result, we should return it unchanged. - return result -} - -function report(result, details) -{ - if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/) - { - msg = ": " test_script_name - add_test_result(result) - } - else if (result == "#") - { - msg = " " test_script_name ":" - } - else - { - abort("in function report()") - } - if (length(details)) - msg = msg " " details - # Output on console might be colorized. - print decorate_result(result) msg - # Log the result in the log file too, to help debugging (this is - # especially true when said result is a TAP error or "Bail out!"). - print result msg | "cat >&3"; -} - -function testsuite_error(error_message) -{ - report("ERROR", "- " error_message) -} - -function handle_tap_result() -{ - details = result_obj["number"]; - if (length(result_obj["description"])) - details = details " " result_obj["description"] - - if (plan_seen == LATE_PLAN) - { - details = details " # AFTER LATE PLAN"; - } - else if (result_obj["is_unplanned"]) - { - details = details " # UNPLANNED"; - } - else if (result_obj["number"] != testno) - { - details = sprintf("%s # OUT-OF-ORDER (expecting %d)", - details, testno); - } - else if (result_obj["directive"]) - { - details = details " # " result_obj["directive"]; - if (length(result_obj["explanation"])) - details = details " " result_obj["explanation"] - } - - report(stringify_result_obj(result_obj), details) -} - -# `skip_reason` should be empty whenever planned > 0. -function handle_tap_plan(planned, skip_reason) -{ - planned += 0 # Avoid getting confused if, say, `planned` is "00" - if (length(skip_reason) && planned > 0) - abort("in function handle_tap_plan()") - if (plan_seen) - { - # Error, only one plan per stream is acceptable. - testsuite_error("multiple test plans") - return; - } - planned_tests = planned - # The TAP plan can come before or after *all* the TAP results; we speak - # respectively of an "early" or a "late" plan. If we see the plan line - # after at least one TAP result has been seen, assume we have a late - # plan; in this case, any further test result seen after the plan will - # be flagged as an error. - plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN) - # If testno > 0, we have an error ("too many tests run") that will be - # automatically dealt with later, so do not worry about it here. If - # $plan_seen is true, we have an error due to a repeated plan, and that - # has already been dealt with above. Otherwise, we have a valid "plan - # with SKIP" specification, and should report it as a particular kind - # of SKIP result. - if (planned == 0 && testno == 0) - { - if (length(skip_reason)) - skip_reason = "- " skip_reason; - report("SKIP", skip_reason); - } -} - -function extract_tap_comment(line) -{ - if (index(line, diag_string) == 1) - { - # Strip leading `diag_string` from `line`. - line = substr(line, length(diag_string) + 1) - # And strip any leading and trailing whitespace left. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - # Return what is left (if any). - return line; - } - return ""; -} - -# When this function is called, we know that line is a TAP result line, -# so that it matches the (perl) RE "^(not )?ok\b". -function setup_result_obj(line) -{ - # Get the result, and remove it from the line. - result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0) - sub("^(not )?ok[ \t]*", "", line) - - # If the result has an explicit number, get it and strip it; otherwise, - # automatically assing the next progresive number to it. - if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) - { - match(line, "^[0-9]+") - # The final `+ 0` is to normalize numbers with leading zeros. - result_obj["number"] = substr(line, 1, RLENGTH) + 0 - line = substr(line, RLENGTH + 1) - } - else - { - result_obj["number"] = testno - } - - if (plan_seen == LATE_PLAN) - # No further test results are acceptable after a "late" TAP plan - # has been seen. - result_obj["is_unplanned"] = 1 - else if (plan_seen && testno > planned_tests) - result_obj["is_unplanned"] = 1 - else - result_obj["is_unplanned"] = 0 - - # Strip trailing and leading whitespace. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - - # This will have to be corrected if we have a "TODO"/"SKIP" directive. - result_obj["description"] = line - result_obj["directive"] = "" - result_obj["explanation"] = "" - - if (index(line, "#") == 0) - return # No possible directive, nothing more to do. - - # Directives are case-insensitive. - rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*" - - # See whether we have the directive, and if yes, where. - pos = match(line, rx "$") - if (!pos) - pos = match(line, rx "[^a-zA-Z0-9_]") - - # If there was no TAP directive, we have nothing more to do. - if (!pos) - return - - # Let`s now see if the TAP directive has been escaped. For example: - # escaped: ok \# SKIP - # not escaped: ok \\# SKIP - # escaped: ok \\\\\# SKIP - # not escaped: ok \ # SKIP - if (substr(line, pos, 1) == "#") - { - bslash_count = 0 - for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--) - bslash_count += 1 - if (bslash_count % 2) - return # Directive was escaped. - } - - # Strip the directive and its explanation (if any) from the test - # description. - result_obj["description"] = substr(line, 1, pos - 1) - # Now remove the test description from the line, that has been dealt - # with already. - line = substr(line, pos) - # Strip the directive, and save its value (normalized to upper case). - sub("^[ \t]*#[ \t]*", "", line) - result_obj["directive"] = toupper(substr(line, 1, 4)) - line = substr(line, 5) - # Now get the explanation for the directive (if any), with leading - # and trailing whitespace removed. - sub("^[ \t]*", "", line) - sub("[ \t]*$", "", line) - result_obj["explanation"] = line -} - -function get_test_exit_message(status) -{ - if (status == 0) - return "" - if (status !~ /^[1-9][0-9]*$/) - abort("getting exit status") - if (status < 127) - exit_details = "" - else if (status == 127) - exit_details = " (command not found?)" - else if (status >= 128 && status <= 255) - exit_details = sprintf(" (terminated by signal %d?)", status - 128) - else if (status > 256 && status <= 384) - # We used to report an "abnormal termination" here, but some Korn - # shells, when a child process die due to signal number n, can leave - # in $? an exit status of 256+n instead of the more standard 128+n. - # Apparently, both behaviours are allowed by POSIX (2008), so be - # prepared to handle them both. See also Austing Group report ID - # 0000051 <http://www.austingroupbugs.net/view.php?id=51> - exit_details = sprintf(" (terminated by signal %d?)", status - 256) - else - # Never seen in practice. - exit_details = " (abnormal termination)" - return sprintf("exited with status %d%s", status, exit_details) -} - -function write_test_results() -{ - print ":global-test-result: " get_global_test_result() > trs_file - print ":recheck: " yn(must_recheck()) > trs_file - 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(trs_file); -} - -BEGIN { - -## ------- ## -## SETUP ## -## ------- ## - -'"$init_colors"' - -# Properly initialized once the TAP plan is seen. -planned_tests = 0 - -COOKED_PASS = expect_failure ? "XPASS": "PASS"; -COOKED_FAIL = expect_failure ? "XFAIL": "FAIL"; - -# Enumeration-like constants to remember which kind of plan (if any) -# has been seen. It is important that NO_PLAN evaluates "false" as -# a boolean. -NO_PLAN = 0 -EARLY_PLAN = 1 -LATE_PLAN = 2 - -testno = 0 # Number of test results seen so far. -bailed_out = 0 # Whether a "Bail out!" directive has been seen. - -# Whether the TAP plan has been seen or not, and if yes, which kind -# it is ("early" is seen before any test result, "late" otherwise). -plan_seen = NO_PLAN - -## --------- ## -## PARSING ## -## --------- ## - -is_first_read = 1 - -while (1) - { - # Involutions required so that we are able to read the exit status - # from the last input line. - st = getline - if (st < 0) # I/O error. - fatal("I/O error while reading from input stream") - else if (st == 0) # End-of-input - { - if (is_first_read) - abort("in input loop: only one input line") - break - } - if (is_first_read) - { - is_first_read = 0 - nextline = $0 - continue - } - else - { - curline = nextline - nextline = $0 - $0 = curline - } - # Copy any input line verbatim into the log file. - print | "cat >&3" - # Parsing of TAP input should stop after a "Bail out!" directive. - if (bailed_out) - continue - - # TAP test result. - if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/) - { - testno += 1 - setup_result_obj($0) - handle_tap_result() - } - # TAP plan (normal or "SKIP" without explanation). - else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/) - { - # The next two lines will put the number of planned tests in $0. - sub("^1\\.\\.", "") - sub("[^0-9]*$", "") - handle_tap_plan($0, "") - continue - } - # TAP "SKIP" plan, with an explanation. - else if ($0 ~ /^1\.\.0+[ \t]*#/) - { - # The next lines will put the skip explanation in $0, stripping - # any leading and trailing whitespace. This is a little more - # tricky in truth, since we want to also strip a potential leading - # "SKIP" string from the message. - sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "") - sub("[ \t]*$", ""); - handle_tap_plan(0, $0) - } - # "Bail out!" magic. - # Older versions of prove and TAP::Harness (e.g., 3.17) did not - # recognize a "Bail out!" directive when preceded by leading - # whitespace, but more modern versions (e.g., 3.23) do. So we - # emulate the latter, "more modern" behaviour. - else if ($0 ~ /^[ \t]*Bail out!/) - { - bailed_out = 1 - # Get the bailout message (if any), with leading and trailing - # whitespace stripped. The message remains stored in `$0`. - sub("^[ \t]*Bail out![ \t]*", ""); - sub("[ \t]*$", ""); - # Format the error message for the - bailout_message = "Bail out!" - if (length($0)) - bailout_message = bailout_message " " $0 - testsuite_error(bailout_message) - } - # Maybe we have too look for dianogtic comments too. - else if (comments != 0) - { - comment = extract_tap_comment($0); - if (length(comment)) - report("#", comment); - } - } - -## -------- ## -## FINISH ## -## -------- ## - -# A "Bail out!" directive should cause us to ignore any following TAP -# error, as well as a non-zero exit status from the TAP producer. -if (!bailed_out) - { - if (!plan_seen) - { - testsuite_error("missing test plan") - } - else if (planned_tests != testno) - { - bad_amount = testno > planned_tests ? "many" : "few" - testsuite_error(sprintf("too %s tests run (expected %d, got %d)", - bad_amount, planned_tests, testno)) - } - if (!ignore_exit) - { - # Fetch exit status from the last line. - exit_message = get_test_exit_message(nextline) - if (exit_message) - testsuite_error(exit_message) - } - } - -write_test_results() - -exit 0 - -} # End of "BEGIN" block. -' - -# TODO: document that we consume the file descriptor 3 :-( -} 3>"$log_file" - -test $? -eq 0 || fatal "I/O or internal error" - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: -- 2.21.0

2 1