October 2016 - Pacman-contrib - lists.archlinux.org

[pacman-contrib] [PATCH] Move over pacsort testsuite
by Johannes Löthberg 01 Nov '16

01 Nov '16

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Makefile.am | 12 +- build-aux/tap-driver.sh | 652 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + test/Makefile.am | 7 + test/pacsorttest.sh | 113 +++++++++ test/tap.sh | 163 ++++++++++++ 6 files changed, 947 insertions(+), 1 deletion(-) create mode 100755 build-aux/tap-driver.sh create mode 100644 test/Makefile.am create mode 100755 test/pacsorttest.sh create mode 100644 test/tap.sh diff --git a/Makefile.am b/Makefile.am index ff369d2..2b86c2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src lib +SUBDIRS = src lib test if WANT_DOC SUBDIRS += doc endif @@ -6,3 +6,13 @@ endif DIST_SUBDIRS = $(SUBDIRS) DISTCHECK_CONFIGURE_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc --disable-git-version + +TESTS = \ + test/pacsorttest.sh + + +TEST_SUITE_LOG = test/test-suite.log +AM_TESTS_ENVIRONMENT = \ + PMTEST_BIN_DIR=$(top_builddir)/src/; export PMTEST_UTIL_DIR; +LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ + $(top_srcdir)/build-aux/tap-driver.sh diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh new file mode 100755 index 0000000..19aa531 --- /dev/null +++ b/build-aux/tap-driver.sh @@ -0,0 +1,652 @@ +#! /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: diff --git a/configure.ac b/configure.ac index ce7dd96..e2d998a 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,7 @@ AC_CONFIG_FILES([ lib/Makefile src/Makefile doc/Makefile + test/Makefile Makefile ]) AC_OUTPUT diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..9ab85cb --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,7 @@ +check_SCRIPTS = \ + pacsorttest.sh + +noinst_SCRIPTS = $(check_SCRIPTS) + +EXTRA_DIST = \ + $(check_SCRIPTS) diff --git a/test/pacsorttest.sh b/test/pacsorttest.sh new file mode 100755 index 0000000..380d1dc --- /dev/null +++ b/test/pacsorttest.sh @@ -0,0 +1,113 @@ +#!/bin/bash +# +# pacsorttest - a test suite for pacsort +# +# Copyright (c) 2013-2015 by Pacman Development Team <pacman-dev(a)archlinux.org> +# Copyright (c) 2011 by Dan McGee <dan(a)archlinux.org> +# +# 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 of the License, 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/>. + +source "$(dirname "$0")"/tap.sh || exit 1 + +# default binary if one was not specified as $1 +bin=${1:-${PMTEST_BIN_DIR}pacsort} + +if ! type -p "$bin" &>/dev/null; then + tap_bail "pacsort binary ($bin) could not be located" + exit 1 +fi + +# args: +# runtest input expected test_description optional_opts +tap_runtest() { + # run the test + tap_diff <(printf "$1" | $bin $4) <(printf "$2") "$3" +} + +tap_plan 26 + +in="1\n2\n3\n4\n" +tap_runtest $in $in "already ordered" + +in="4\n2\n3\n1\n" +ex="1\n2\n3\n4\n" +tap_runtest $in $ex "easy reordering" + +in="1\n2\n3\n4" +ex="1\n2\n3\n4\n" +tap_runtest $in $ex "add trailing newline" + +in="1\n2\n4\n3" +ex="1\n2\n3\n4\n" +tap_runtest $in $ex "add trailing newline" + +in="1.0-1\n1.0\n1.0-2\n1.0\n" +tap_runtest $in $in "stable sort" + +in="firefox-18.0-2-x86_64.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort" "--files" + +in="firefox-18.0-2\nfirefox-18.0.1-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort with invalid filename" "--files" + +in="firefox-18.0-2-x86_64.pkg.tar.xz\n/path2/firefox-18.0.1-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort maybe with leading paths" "--files" + +in="/path1/firefox-18.0-2-x86_64.pkg.tar.xz\n/path2/firefox-18.0.1-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort with different leading paths" "--files" + +in="/path2/firefox-18.0-2-x86_64.pkg.tar.xz\n/path1/path2/firefox-18.0.1-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort with uneven leading path components" "--files" + +in="firefox-18.0-2-i686.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.gz\n" +tap_runtest $in $in "filename sort with different extensions" "--files" + +in="/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n/packages/dialog-1:1.2_20130928-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort with epoch" "--files" + +in="/packages/dia-log-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort with differing package names and epoch" "--files" + +in="/packages/systemd-217-1-x86_64.pkg.tar.xz\n/packages/systemd-sysvcompat-217-1-x86_64.pkg.tar.xz\n" +tap_runtest $in $in "filename sort with package names as shared substring" "--files" + +# generate some long input/expected for the next few tests +declare normal reverse names_normal names_reverse +for ((i=1; i<600; i++)); do + normal="${normal}${i}\n" + reverse="${reverse}$((600 - ${i}))\n" + fields="${fields}colA bogus$((600 - ${i})) ${i}\n" + fields_reverse="${fields_reverse}colA bogus${i} $((600 - ${i}))\n" + separator="${separator}colA|bogus$((600 - ${i}))|${i}\n" + separator_reverse="${separator_reverse}colA|bogus${i}|$((600 - ${i}))\n" +done + +tap_runtest $normal $normal "really long input" +tap_runtest $reverse $normal "really long input" +tap_runtest $reverse $reverse "really long input, reversed" "-r" +tap_runtest $normal $reverse "really long input, reversed" "-r" + +tap_runtest "$fields" "$fields" "really long input, sort key" "-k3" +tap_runtest "$fields_reverse" "$fields" "really long input, sort key" "-k3" +tap_runtest "$fields_reverse" "$fields_reverse" "really long input, sort key, reversed" "-k 3 -r" +tap_runtest "$fields" "$fields_reverse" "really long input, sort key, reversed" "-k 3 -r" + +tap_runtest "$separator" "$separator" "really long input, sort key, separator" "-k3 -t|" +tap_runtest "$separator_reverse" "$separator" "really long input, sort key, separator" "-k3 -t|" +tap_runtest "$separator_reverse" "$separator_reverse" "really long input, sort key, separator, reversed" "-k 3 -t| -r" +tap_runtest "$separator" "$separator_reverse" "really long input, sort key, separator, reversed" "-k 3 -t| -r" + +tap_finish + +# vim: set noet: diff --git a/test/tap.sh b/test/tap.sh new file mode 100644 index 0000000..3885269 --- /dev/null +++ b/test/tap.sh @@ -0,0 +1,163 @@ +# Copyright 2014 Andrew Gregory <andrew.gregory.8(a)gmail.com> +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +# +# Project URL: http://github.com/andrewgregory/tap.sh + +declare -i tap_planned=0 tap_run=0 tap_failed=0 tap_passed=0 +declare tap_todo='' + +tap_plan() { + tap_planned=$1 + printf "1..%d\n" "$tap_planned" +} + +tap_done_testing() { + tap_plan $tap_run +} + +tap_skip_all() { + printf "1..0 # SKIP" + _tap_print_reason " " "$@" + printf "\n" +} + +tap_diag() { + if [[ -n $tap_todo ]]; then + tap_note "$@" + else + tap_note "$@" 1>&2 + fi +} + +tap_note() { + printf "# " + printf -- "$@" + printf "\n" +} + +tap_bail() { + printf "Bail out!" + _tap_print_reason " " "$@" + printf "\n" +} + +tap_finish() { + local tap_todo='' + if (( tap_planned != tap_run )); then + tap_note "Looks like you planned %d tests but ran %d." "$tap_planned" "$tap_run" + elif (( tap_planned == tap_run && tap_failed == 0 )); then + tap_note "All %d tests successfully run." "$tap_planned" + else + tap_note "Failed %d of %d tests." "$tap_failed" "$tap_planned" + fi + (( tap_planned == tap_run && tap_failed == 0 )) +} + +tap_skip() { + local -i count="$1"; shift + while (( count-- )); do + (( tap_run++ )) + printf "ok %d # SKIP" "$tap_run" + _tap_print_reason " " "$@" + printf "\n" + done +} + +_tap_print_reason() { + local sep="$1"; shift + if [[ $# -gt 0 ]]; then + printf "%s" "$sep" + printf -- "$@" + fi +} + +tap_ok() { + local ok="$1"; shift + (( tap_run++ )) + if [[ $ok -eq 0 ]]; then + (( tap_passed++ )) + printf "ok %d" "$tap_run" + else + (( tap_failed++ )) + printf "not ok %d" "$tap_run" + fi + _tap_print_reason " - " "$@" + if [[ -n $tap_todo ]]; then + printf " # TODO %s" "$tap_todo" + fi + printf "\n" + if [[ $ok -ne 0 ]]; then + local line func file + local -i i=0 + + read line func file < <(caller $i) + while [[ -n $func && $func == tap_* ]]; do + (( i++ )) + read line func file < <(caller $i) + done + + if [[ -n $file ]]; then + file=${file##*/} + if [[ -n $tap_todo ]]; then + tap_diag " Failed (TODO) test at %s line %d." "${file}" "$line" + else + tap_diag " Failed test at %s line %d." "${file}" "$line" + fi + fi + fi + return $ok +} + +tap_is_str() { + local got="$1" expected="$2"; shift 2 + [[ $got == $expected ]] + local ret=$? + if ! tap_ok $ret "$@"; then + tap_diag " got: '%s'" "$got" + tap_diag " expected: '%s'" "$expected" + fi + return $ret +} + +tap_is_int() { + local got="$1" expected="$2"; shift 2 + [[ $got -eq $expected ]] + local ret=$? + if ! tap_ok $ret "$@"; then + tap_diag " got: '%s'" "$got" + tap_diag " expected: '%s'" "$expected" + fi + return $ret +} + +tap_diff() { + local got="$1" expected="$2"; shift 2 + local output ret + output="$(diff -u --label got --label expected "$got" "$expected" 2>&1)" + ret=$? + if ! tap_ok $ret "$@"; then + while IFS= read line; do + tap_diag "$line" + done <<<"$output" + fi + return $ret +} + +# vim: ft=sh -- 2.10.1

2 1

[pacman-contrib] [GIT] branch master updated (86adc7b -> 42181f8)
by demize＠archlinux.org 31 Oct '16

31 Oct '16

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 86adc7b configure.ac: Add Vim modeline new 26f3b9f pacsort: Make help/version output follow std-options new c965fc9 Remove (pacman) from help output new 42181f8 Move over pacsort testsuite 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: * 42181f8 (HEAD -> master) Move over pacsort testsuite * c965fc9 Remove (pacman) from help output * 26f3b9f pacsort: Make help/version output follow std-options Detailed log of new commits: commit 42181f85c44de29d40642aeed897e030f30e0559 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Sun Oct 23 16:20:30 2016 +0200 Move over pacsort testsuite Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit c965fc99c42a9fc57d6d0ba86f892950ef8558bf Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Oct 18 10:21:39 2016 +0200 Remove (pacman) from help output Since it's no longer part of pacman proper it doesn't follow the same versions. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 26f3b9f33f484dd74b3eb17acf57e1d85ff0f0a5 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Oct 18 10:19:31 2016 +0200 pacsort: Make help/version output follow std-options Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: Makefile.am | 12 +- build-aux/tap-driver.sh | 652 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + src/checkupdates.sh.in | 2 +- src/paccache.sh.in | 2 +- src/pacdiff.sh.in | 2 +- src/paclist.sh.in | 2 +- src/paclog-pkglist.sh.in | 2 +- src/pacscripts.sh.in | 2 +- src/pacsearch.pl.in | 2 +- src/pacsort.c | 17 +- src/pactree.c | 4 +- src/rankmirrors.sh.in | 2 +- src/updpkgsums.sh.in | 2 +- test/Makefile.am | 7 + test/pacsorttest.sh | 113 ++++++++ test/tap.sh | 163 ++++++++++++ 17 files changed, 974 insertions(+), 13 deletions(-) create mode 100755 build-aux/tap-driver.sh create mode 100644 test/Makefile.am create mode 100755 test/pacsorttest.sh create mode 100644 test/tap.sh -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] Remove (pacman) from help output
by Johannes Löthberg 23 Oct '16

23 Oct '16

Since it's no longer part of pacman proper it doesn't follow the same versions. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/checkupdates.sh.in | 2 +- src/paccache.sh.in | 2 +- src/pacdiff.sh.in | 2 +- src/paclist.sh.in | 2 +- src/paclog-pkglist.sh.in | 2 +- src/pacscripts.sh.in | 2 +- src/pacsearch.pl.in | 2 +- src/pacsort.c | 2 +- src/pactree.c | 4 ++-- src/rankmirrors.sh.in | 2 +- src/updpkgsums.sh.in | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index e76780e..4162548 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -25,7 +25,7 @@ m4_include(../lib/output_format.sh) m4_include(../lib/term_colors.sh) if (( $# > 0 )); then - echo "${myname} (pacman) v${myver}" + echo "${myname} v${myver}" echo echo "Safely print a list of pending updates" echo diff --git a/src/paccache.sh.in b/src/paccache.sh.in index fcdf30b..143c6e3 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -176,7 +176,7 @@ summarize() { usage() { cat <<EOF -${myname} (pacman) v${myver} +${myname} v${myver} A flexible pacman cache cleaning utility. diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index 32f8c06..ef385c2 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -33,7 +33,7 @@ m4_include(../lib/output_format.sh) usage() { cat <<EOF -${myname} (pacman) v${myver} +${myname} v${myver} A simple program to merge or remove pacnew/pacsave files. diff --git a/src/paclist.sh.in b/src/paclist.sh.in index f4fd540..f827dcf 100644 --- a/src/paclist.sh.in +++ b/src/paclist.sh.in @@ -31,7 +31,7 @@ if ! type gettext &>/dev/null; then fi usage() { - printf "%s (pacman) v%s\n" "${myname}" "${myver}" + printf "%s v%s\n" "${myname}" "${myver}" echo printf "List all packages installed from a given repository\n" "${myname}" echo diff --git a/src/paclog-pkglist.sh.in b/src/paclog-pkglist.sh.in index 847b389..9c137e0 100644 --- a/src/paclog-pkglist.sh.in +++ b/src/paclog-pkglist.sh.in @@ -25,7 +25,7 @@ export TEXTDOMAINDIR='/usr/share/locale' declare logfile=${1:-@localstatedir@/log/pacman.log} usage() { - printf "%s (pacman) v%s\n" "${myname}" "${myver}" + printf "%s v%s\n" "${myname}" "${myver}" echo echo "Parse a log file into a list of currently installed packages" echo diff --git a/src/pacscripts.sh.in b/src/pacscripts.sh.in index d769595..68c9441 100644 --- a/src/pacscripts.sh.in +++ b/src/pacscripts.sh.in @@ -45,7 +45,7 @@ error() { } usage() { - echo "${myname} (pacman) v${myver}" + echo "${myname} v${myver}" echo echo "Prints the {pre,post}_{install,remove,upgrade} scripts of a given package." echo diff --git a/src/pacsearch.pl.in b/src/pacsearch.pl.in index a89328d..0f6b3ea 100644 --- a/src/pacsearch.pl.in +++ b/src/pacsearch.pl.in @@ -27,7 +27,7 @@ my $myname = 'pacsearch'; my $myver = '@PACKAGE_VERSION@'; sub usage { - print "$myname (pacman) v$myver\n\n"; + print "$myname v$myver\n\n"; print "Perform a pacman search using both the local and the sync databases.\n\n"; print "Usage: $myname [-n] <pattern>\n\n"; print "Options:\n"; diff --git a/src/pacsort.c b/src/pacsort.c index 019f202..dcff76c 100644 --- a/src/pacsort.c +++ b/src/pacsort.c @@ -419,7 +419,7 @@ static char escape_char(const char *string) static void usage(void) { - printf("pacsort (pacman) v" PACKAGE_VERSION "\n\n" + printf("pacsort v" PACKAGE_VERSION "\n\n" "A sort utility implementing alpm_pkg_vercmp.\n\n" "Usage: pacsort [options] [files...]\n\n" " -f, --files assume inputs are file paths of packages\n" diff --git a/src/pactree.c b/src/pactree.c index b9d47e9..13f9e72 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -211,7 +211,7 @@ static void cleanup(int ret) static void usage(void) { - fprintf(stdout, "pactree (pacman) v" PACKAGE_VERSION "\n\n" + fprintf(stdout, "pactree v" PACKAGE_VERSION "\n\n" "A simple dependency tree viewer.\n\n" "Usage: pactree [options] PACKAGE\n\n" " -a, --ascii use ASCII characters for tree formatting\n" @@ -230,7 +230,7 @@ static void usage(void) static void version(void) { - fprintf(stdout, "pactree (pacman) v" PACKAGE_VERSION "\n"); + fprintf(stdout, "pactree v" PACKAGE_VERSION "\n"); } static int parse_options(int argc, char *argv[]) diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in index 7b50eb2..a05b8e0 100644 --- a/src/rankmirrors.sh.in +++ b/src/rankmirrors.sh.in @@ -25,7 +25,7 @@ declare -r myname='rankmirrors' declare -r myver='@PACKAGE_VERSION@' usage() { - echo "${myname} (pacman) v${myver}" + echo "${myname} v${myver}" echo echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" echo "files are located in @sysconfdir@/pacman.d/. It can also rank one mirror if the URL is" diff --git a/src/updpkgsums.sh.in b/src/updpkgsums.sh.in index c571d29..9c545ea 100644 --- a/src/updpkgsums.sh.in +++ b/src/updpkgsums.sh.in @@ -23,7 +23,7 @@ declare -r myname='updpkgsums' declare -r myver='@PACKAGE_VERSION@' usage() { - printf "%s (pacman) v%s\n" "${myname}" "${myver}" + printf "%s v%s\n" "${myname}" "${myver}" echo printf "%s will perform an in place update of the checksums in the\n" "${myname}" echo "path specified by [build file], defaulting to PKGBUILD in the current" -- 2.10.1

1 0

[pacman-contrib] [PATCH] pacsort: Make help/version output follow std-options
by Johannes Löthberg 23 Oct '16

23 Oct '16

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pacsort.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pacsort.c b/src/pacsort.c index 6d1bf25..019f202 100644 --- a/src/pacsort.c +++ b/src/pacsort.c @@ -67,6 +67,7 @@ static struct options_t { int null; int filemode; int help; + int version; char delim; } opts; @@ -418,7 +419,7 @@ static char escape_char(const char *string) static void usage(void) { - fprintf(stderr, "pacsort (pacman) v" PACKAGE_VERSION "\n\n" + printf("pacsort (pacman) v" PACKAGE_VERSION "\n\n" "A sort utility implementing alpm_pkg_vercmp.\n\n" "Usage: pacsort [options] [files...]\n\n" " -f, --files assume inputs are file paths of packages\n" @@ -432,6 +433,11 @@ static void usage(void) "Standard input is read when no files are given.\n\n"); } +static void version(void) +{ + printf("pacsort v" PACKAGE_VERSION "\n"); +} + static int parse_options(int argc, char **argv) { int opt; @@ -442,6 +448,7 @@ static int parse_options(int argc, char **argv) {"key", required_argument, 0, 'k'}, {"reverse", no_argument, 0, 'r'}, {"separator", required_argument, 0, 't'}, + {"version", no_argument, 0, 'v'}, {"null", no_argument, 0, 'z'}, {0, 0, 0, 0} }; @@ -471,6 +478,9 @@ static int parse_options(int argc, char **argv) return 1; } break; + case 'v': + opts.version = 1; + return 0; case 'z': opts.null = 1; break; @@ -505,6 +515,11 @@ int main(int argc, char *argv[]) return 0; } + if(opts.version) { + version(); + return 0; + } + list = list_new(100); buffer = buffer_new(BUFSIZ * 3); -- 2.10.1

1 0

[pacman-contrib] [PATCH 1/2] pacsort: Make help/version output follow std-options
by Johannes Löthberg 18 Oct '16

18 Oct '16

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pacsort.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pacsort.c b/src/pacsort.c index 6d1bf25..019f202 100644 --- a/src/pacsort.c +++ b/src/pacsort.c @@ -67,6 +67,7 @@ static struct options_t { int null; int filemode; int help; + int version; char delim; } opts; @@ -418,7 +419,7 @@ static char escape_char(const char *string) static void usage(void) { - fprintf(stderr, "pacsort (pacman) v" PACKAGE_VERSION "\n\n" + printf("pacsort (pacman) v" PACKAGE_VERSION "\n\n" "A sort utility implementing alpm_pkg_vercmp.\n\n" "Usage: pacsort [options] [files...]\n\n" " -f, --files assume inputs are file paths of packages\n" @@ -432,6 +433,11 @@ static void usage(void) "Standard input is read when no files are given.\n\n"); } +static void version(void) +{ + printf("pacsort v" PACKAGE_VERSION "\n"); +} + static int parse_options(int argc, char **argv) { int opt; @@ -442,6 +448,7 @@ static int parse_options(int argc, char **argv) {"key", required_argument, 0, 'k'}, {"reverse", no_argument, 0, 'r'}, {"separator", required_argument, 0, 't'}, + {"version", no_argument, 0, 'v'}, {"null", no_argument, 0, 'z'}, {0, 0, 0, 0} }; @@ -471,6 +478,9 @@ static int parse_options(int argc, char **argv) return 1; } break; + case 'v': + opts.version = 1; + return 0; case 'z': opts.null = 1; break; @@ -505,6 +515,11 @@ int main(int argc, char *argv[]) return 0; } + if(opts.version) { + version(); + return 0; + } + list = list_new(100); buffer = buffer_new(BUFSIZ * 3); -- 2.10.0

1 1

[pacman-contrib] [GIT] branch master updated (a2b1db8 -> 86adc7b)
by demize＠archlinux.org 18 Oct '16

18 Oct '16

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from a2b1db8 Make sure git-describe is in long format new 17beb34 pactree: Add --version new a970b3a pacscripts: Make short version flag -v new d45b4d0 Fix distcheck new f308492 Add pacsort new d45a9b1 Update gitignore new 9b66899 src: Add gitignore new 86adc7b configure.ac: Add Vim modeline The 7 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: * 86adc7b (HEAD -> master) configure.ac: Add Vim modeline * 9b66899 src: Add gitignore * d45a9b1 Update gitignore * f308492 Add pacsort * d45b4d0 Fix distcheck * a970b3a pacscripts: Make short version flag -v * 17beb34 pactree: Add --version Detailed log of new commits: commit 86adc7b22ca4ccd19383753c170ddf5d6b525681 Author: Daniel M. Capella <polyzen(a)archlinux.info> Date: Tue Oct 18 03:28:14 2016 -0400 configure.ac: Add Vim modeline Message-Id: <20161018072814.19439-4-polyzen(a)archlinux.info> commit 9b668990f0c9e7e46a149665712ec8858510607b Author: Daniel M. Capella <polyzen(a)archlinux.info> Date: Tue Oct 18 03:28:13 2016 -0400 src: Add gitignore Message-Id: <20161018072814.19439-3-polyzen(a)archlinux.info> commit d45a9b15ba530948f8b4d20e866e74b06b125d0c Author: Daniel M. Capella <polyzen(a)archlinux.info> Date: Tue Oct 18 03:28:12 2016 -0400 Update gitignore Message-Id: <20161018072814.19439-2-polyzen(a)archlinux.info> commit f3084926d7bcdcbb0edc952436d5ba9a1121e645 Author: Daniel M. Capella <polyzen(a)archlinux.info> Date: Tue Oct 18 03:28:11 2016 -0400 Add pacsort Message-Id: <20161018072814.19439-1-polyzen(a)archlinux.info> commit d45b4d0f1c220ab9edee00df00ede5ebaed81fe1 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Oct 17 14:45:08 2016 +0200 Fix distcheck Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit a970b3aacaf8d0e5f8873f1fc767adc758ae27a8 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Oct 17 14:42:28 2016 +0200 pacscripts: Make short version flag -v This follows the existing --help message and what automake expects. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 17beb34556349e6c25fc6a2500b4babc2db42df9 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Oct 17 14:18:11 2016 +0200 pactree: Add --version Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: .gitignore | 11 +- Makefile.am | 2 +- configure.ac | 2 + doc/Makefile.am | 4 +- src/.gitignore | 14 ++ src/Makefile.am | 9 +- src/pacscripts.sh.in | 2 +- src/pacsort.c | 551 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/pactree.c | 88 ++++---- 9 files changed, 637 insertions(+), 46 deletions(-) create mode 100644 src/.gitignore create mode 100644 src/pacsort.c -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH 1/4] Add pacsort
by Daniel M. Capella 18 Oct '16

18 Oct '16

--- src/Makefile.am | 5 +- src/pacsort.c | 551 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 555 insertions(+), 1 deletion(-) create mode 100644 src/pacsort.c diff --git a/src/Makefile.am b/src/Makefile.am index fed4422..f9a489e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ dbpath = ${localstatedir}/lib/pacman/ bin_SCRIPTS = \ $(OURSCRIPTS) -bin_PROGRAMS = pactree +bin_PROGRAMS = pacsort pactree vim_ftdetect_dir = $(vim_dir)/ftdetect vim_syntax_dir = $(vim_dir)/syntax @@ -113,6 +113,9 @@ updpkgsums: $(srcdir)/updpkgsums.sh.in pacsearch: $(srcdir)/pacsearch.pl.in +pacsort_SOURCES = pacsort.c +pacsort_LDADD = $(LIBARCHIVE_LIBS) $(LIBALPM_LIBS) + pactree_SOURCES = pactree.c pactree_LDADD = $(LIBARCHIVE_LIBS) $(LIBALPM_LIBS) diff --git a/src/pacsort.c b/src/pacsort.c new file mode 100644 index 0000000..6d1bf25 --- /dev/null +++ b/src/pacsort.c @@ -0,0 +1,551 @@ +/* + * pacsort.c - a sort utility implementing alpm_pkg_vercmp + * + * Copyright (c) 2010-2016 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * 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 of the License, 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/>. + */ + +#include <errno.h> +#include <fnmatch.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <alpm.h> + +#define DELIM ' ' +#define INVALD_ESCAPE_CHAR ((char)-1) + +#ifndef MIN +#define MIN(a, b) \ + __extension__({ \ + __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; \ + }) +#endif + +struct buffer_t { + char *mem; + size_t len; + size_t maxlen; +}; + +struct list_t { + void **list; + size_t count; + size_t maxcount; +}; + +struct input_t { + char *data; + int is_file; + + const char *pkgname; + size_t pkgname_len; + + const char *pkgver; + size_t pkgver_len; +}; + +static struct options_t { + int order; + int sortkey; + int null; + int filemode; + int help; + char delim; +} opts; + +static struct buffer_t *buffer_new(size_t initial_size) +{ + struct buffer_t *buf; + + buf = calloc(1, sizeof(*buf)); + if(!buf) { + return NULL; + } + + buf->mem = calloc(initial_size, sizeof(char)); + if(!buf->mem) { + free(buf); + return NULL; + } + + buf->len = 0; + buf->maxlen = initial_size; + + return buf; +} + +static void buffer_free(struct buffer_t *buf) +{ + if(!buf) { + return; + } + + free(buf->mem); + free(buf); +} + +static int buffer_grow(struct buffer_t *buffer) +{ + size_t newsz = buffer->maxlen * 2.5; + char* new_mem = realloc(buffer->mem, newsz * sizeof(char)); + if(!new_mem) { + return 1; + } + buffer->mem = new_mem; + buffer->maxlen = newsz; + + return 0; +} + +static struct list_t *list_new(size_t initial_size) +{ + struct list_t *list; + + list = calloc(1, sizeof(struct list_t)); + if(!list) { + return NULL; + } + + list->list = calloc(initial_size, sizeof(char *)); + if(!list->list) { + free(list); + return NULL; + } + + list->maxcount = initial_size; + + return list; +} + +static int list_grow(struct list_t *list) +{ + size_t newsz = list->maxcount * 2.5; + void **new_list = realloc(list->list, newsz * sizeof(char *)); + if(!new_list) { + return 1; + } + + list->list = new_list; + list->maxcount = newsz; + + return 0; +} + +static int list_add(struct list_t *list, void *obj) +{ + if(!list || !obj) { + return 1; + } + + if(list->count + 1 >= list->maxcount) { + if(list_grow(list) != 0) { + return 1; + } + } + + list->list[list->count] = obj; + list->count++; + + return 0; +} + +static void list_free(struct list_t *list, void (*freefn)(void *)) +{ + size_t i; + + if(!list) { + return; + } + + if(list->list) { + for(i = 0; i < list->count; i++) { + freefn(list->list[i]); + } + free(list->list); + } + free(list); +} + +static void input_free(void *p) +{ + struct input_t *in = p; + + if(in == NULL) { + return; + } + + free(in->data); + free(in); +} + +static struct input_t *input_new(const char *path, int pathlen) +{ + const char *pkgver_end; + const char *slash; + struct input_t *in; + + in = calloc(1, sizeof(struct input_t)); + if(in == NULL) { + return NULL; + } + + in->data = strndup(path, pathlen); + if(in->data == NULL) { + free(in); + return NULL; + } + + in->is_file = fnmatch("*-*.pkg.tar.?z", in->data, 0) == 0; + if(!in->is_file) { + return in; + } + + /* for files, we parse the pkgname and pkgrel from the full filename. */ + + slash = strrchr(in->data, '/'); + if(slash == NULL) { + in->pkgname = in->data; + } else { + in->pkgname = slash + 1; + } + + pkgver_end = strrchr(in->pkgname, '-'); + + /* read backwards through pkgrel */ + for(in->pkgver = pkgver_end - 1; + in->pkgver > in->pkgname && *in->pkgver != '-'; + --in->pkgver) + ; + /* read backwards through pkgver */ + for(--in->pkgver; + in->pkgver > in->pkgname && *in->pkgver != '-'; + --in->pkgver) + ; + ++in->pkgver; + + in->pkgname_len = in->pkgver - in->pkgname - 1; + in->pkgver_len = pkgver_end - in->pkgver; + + return in; +} + +static char *explode(struct buffer_t *buffer, struct list_t *list) +{ + char *ptr, *end; + const char linedelim = opts.null ? '\0' : '\n'; + struct input_t *meta; + + ptr = buffer->mem; + while((end = memchr(ptr, linedelim, &buffer->mem[buffer->len] - ptr))) { + *end = '\0'; + meta = input_new(ptr, end - ptr); + if(meta == NULL || list_add(list, meta) != 0) { + input_free(meta); + return NULL; + } + ptr = end + 1; + } + + return ptr; +} + +static int splitfile(FILE *stream, struct buffer_t *buffer, struct list_t *list) +{ + size_t nread; + char *ptr; + + while(!feof(stream)) { + /* check if a read of BUFSIZ chars will overflow */ + if(buffer->len + BUFSIZ + 1 >= buffer->maxlen) { + if(buffer_grow(buffer) != 0) { + return 1; + } + } + + nread = fread(&buffer->mem[buffer->len], 1, BUFSIZ, stream); + if(nread == 0) { + break; /* EOF */ + } + buffer->len += nread; + + if((ptr = explode(buffer, list)) == NULL) { + return 1; + } + + if(ptr != buffer->mem) { + /* realign the data in the buffer */ + buffer->len = &buffer->mem[buffer->len] - ptr; + memmove(&buffer->mem[0], ptr, buffer->len + 1); + } + } + + if(buffer->len) { + struct input_t *meta = input_new(buffer->mem, buffer->len + 1); + if(meta == NULL || list_add(list, meta) != 0) { + input_free(meta); + return 1; + } + } + + return 0; +} + +/* returns a pointer to the nth column of a string without being destructive */ +static const char *nth_column(const char *string) +{ + const char *prev, *ptr; + int col; + + ptr = prev = string; + for(col = 0; ptr && col < opts.sortkey; col++) { + prev = ptr; + ptr = strchr(ptr, opts.delim); + if(ptr) { + ptr++; + } + } + + return prev; +} + +static int compare_versions(const char *v1, const char *v2) +{ + if(opts.sortkey == 0) { + return opts.order * alpm_pkg_vercmp(v1, v2); + } else { + return opts.order * alpm_pkg_vercmp(nth_column(v1), nth_column(v2)); + } +} + +static int compare_files(const struct input_t *meta1, const struct input_t *meta2) +{ + int cmp; + char *verbuf; + const char *v1, *v2; + + /* sort first by package name */ + cmp = memcmp(meta1->pkgname, meta2->pkgname, + MIN(meta1->pkgname_len, meta2->pkgname_len)); + + /* 1) package names differ, sort by package name */ + if(cmp != 0) { + return opts.order * cmp; + } + + /* 2) prefixes are the same but length differs, sort by length */ + if(meta1->pkgname_len != meta2->pkgname_len) { + return opts.order * (meta1->pkgname_len - meta2->pkgname_len); + } + + /* allocate once with enough space for both pkgver */ + verbuf = calloc(1, meta1->pkgver_len + 1 + meta2->pkgver_len + 1); + memcpy(verbuf, meta1->pkgver, meta1->pkgver_len); + memcpy(&verbuf[meta1->pkgver_len + 1], meta2->pkgver, meta2->pkgver_len); + + /* 3) sort by package version */ + v1 = verbuf; + v2 = verbuf + meta1->pkgver_len + 1; + cmp = compare_versions(v1, v2); + free(verbuf); + + return cmp; +} + +static int vercmp(const void *p1, const void *p2) +{ + const struct input_t *meta1, *meta2; + + meta1 = *(struct input_t **)p1; + meta2 = *(struct input_t **)p2; + + if(opts.filemode && meta1->is_file && meta2->is_file) { + return compare_files(meta1, meta2); + } else { + return compare_versions(meta1->data, meta2->data); + } +} + +static char escape_char(const char *string) +{ + if(!string) { + return INVALD_ESCAPE_CHAR; + } + + const size_t len = strlen(string); + + if(len > 2) { + return INVALD_ESCAPE_CHAR; + } + + if(len == 1) { + return *string; + } + + if(*string != '\\') { + return INVALD_ESCAPE_CHAR; + } + + switch(string[1]) { + case 't': + return '\t'; + case 'n': + return '\n'; + case 'v': + return '\v'; + case '0': + return '\0'; + default: + return INVALD_ESCAPE_CHAR; + } +} + +static void usage(void) +{ + fprintf(stderr, "pacsort (pacman) v" PACKAGE_VERSION "\n\n" + "A sort utility implementing alpm_pkg_vercmp.\n\n" + "Usage: pacsort [options] [files...]\n\n" + " -f, --files assume inputs are file paths of packages\n" + " -h, --help display this help message\n" + " -k, --key <index> sort input starting on specified column\n" + " -r, --reverse sort in reverse order (default: oldest to newest)\n" + " -t, --separator <sep> specify field separator (default: space)\n" + " -z, --null lines end with null bytes, not newlines\n\n" + "pacsort writes the sorted concatenation of all files, to standard output.\n" + "Files should contain a list of inputs to sort.\n\n" + "Standard input is read when no files are given.\n\n"); +} + +static int parse_options(int argc, char **argv) +{ + int opt; + + static const struct option opttable[] = { + {"files", no_argument, 0, 'f'}, + {"help", no_argument, 0, 'h'}, + {"key", required_argument, 0, 'k'}, + {"reverse", no_argument, 0, 'r'}, + {"separator", required_argument, 0, 't'}, + {"null", no_argument, 0, 'z'}, + {0, 0, 0, 0} + }; + + while((opt = getopt_long(argc, argv, "fhk:rt:z", opttable, NULL)) != -1) { + switch(opt) { + case 'f': + opts.filemode = 1; + break; + case 'h': + opts.help = 1; + return 0; + case 'k': + opts.sortkey = (int)strtol(optarg, NULL, 10); + if(opts.sortkey <= 0) { + fprintf(stderr, "error: invalid sort key -- %s\n", optarg); + return 1; + } + break; + case 'r': + opts.order = -1; + break; + case 't': + opts.delim = escape_char(optarg); + if(opts.delim == INVALD_ESCAPE_CHAR) { + fprintf(stderr, "error: invalid field separator -- `%s'\n", optarg); + return 1; + } + break; + case 'z': + opts.null = 1; + break; + default: + return 1; + } + } + + return 0; +} + +int main(int argc, char *argv[]) +{ + struct list_t *list; + struct buffer_t *buffer; + size_t i; + int ret = 0; + + /* option defaults */ + opts.order = 1; + opts.delim = DELIM; + opts.sortkey = 0; + opts.null = 0; + + if(parse_options(argc, argv) != 0) { + usage(); + return 2; + } + + if(opts.help) { + usage(); + return 0; + } + + list = list_new(100); + buffer = buffer_new(BUFSIZ * 3); + + if(optind == argc) { + if(splitfile(stdin, buffer, list) != 0) { + fprintf(stderr, "%s: memory exhausted\n", argv[0]); + ret = ENOMEM; + goto cleanup; + } + } else { + while(optind < argc) { + FILE *input = fopen(argv[optind], "r"); + if(input) { + if(splitfile(input, buffer, list) != 0) { + fprintf(stderr, "%s: memory exhausted\n", argv[0]); + fclose(input); + ret = ENOMEM; + goto cleanup; + } + fclose(input); + } else { + fprintf(stderr, "%s: %s: %s\n", argv[0], argv[optind], strerror(errno)); + } + optind++; + } + } + + if(list->count) { + const char linedelim = opts.null ? '\0' : '\n'; + qsort(list->list, list->count, sizeof(void *), vercmp); + for(i = 0; i < list->count; i++) { + const struct input_t *in = list->list[i]; + printf("%s%c", in->data, linedelim); + } + } + +cleanup: + list_free(list, input_free); + buffer_free(buffer); + + return ret; +} + +/* vim: set noet: */ -- 2.10.0

1 3

[pacman-contrib] [GIT] branch master updated (3035223 -> a2b1db8)
by demize＠archlinux.org 17 Oct '16

17 Oct '16

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 3035223 Update version to 0.0.1 new a2b1db8 Make sure git-describe is in long format 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: * a2b1db8 (HEAD -> master) Make sure git-describe is in long format Detailed log of new commits: commit a2b1db8616d8d44b7083a330f77fe606fd83ab2a Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Oct 17 14:02:43 2016 +0200 Make sure git-describe is in long format Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: doc/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [GIT] branch master updated (bae5fae -> 3035223)
by demize＠archlinux.org 17 Oct '16

17 Oct '16

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from bae5fae doc: Add gitignore add 3035223 Update version to 0.0.1 No new revisions were added by this update. Summary of changes: configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [GIT] annotated tag v0.0.1 created (now 784b4bc)
by demize＠archlinux.org 17 Oct '16

17 Oct '16

This is an automated email from the git hooks/post-receive script. demize pushed a change to annotated tag v0.0.1 in repository pacman-contrib. at 784b4bc (tag) tagging 303522363f3caec28b064a55651950924680cc31 (commit) by Johannes Löthberg on Mon Oct 17 13:58:05 2016 +0200 - Log ----------------------------------------------------------------- First beta release -----BEGIN PGP SIGNATURE----- iQSwBAABCgCaBQJYBLzXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFNTUwRkZGRkQ0ODVFMjY0QTE3MTdFMzA5 MDFDMUMzMjBFQjBENDVEMxSAAAAAABUAFXBrYS1hZGRyZXNzQGdudXBnLm9yZ2pv aGFubmVzQGt5cmlhc2lzLmNvbQAKCRCQHBwyDrDUXUa3H/9BKMnPkEMWcSCU5Lpv zc207HM5US0IUu7eAd3fmhaAPJkCQNVHUPi0e3rovadppXVOTubS25qRmV4TI5v2 eWk20zI5EyU5soaQU1DfaTLNSRdyCuE5/ckiz8UDNA53IYkqe3fTAy9LUBHyTj32 Le+oDcI/pU8vmagkwjA6FFcCPWAgwb5eI4rdMLL6fEewZzsiiUBhysROLjwkUe00 SjT2aXX5maU6ur3u2sGKXrN1H2qeKEhcKHkaN7lKpemwbbSBmVv0doZAwOZMLZ1g uLmylnWNeo7LObjlhfdF4kSb+0ur8orYwfW1Cwvulhjf7az6DGJyM4q1PaZzRKdS N1JahZ5Oa5tvak2ul2J2Xr/7/YEtZlKCzG7IjFPCCTpd8GHkoPkZeqB0mMpzgaLj JP2CV0lIbp4RAbXwpHOmtSjZEbfv1bBli+pp0lSSSBxzF8ppq52QWYdxpEC3VbYL vvxzHV0BgaimJ1XSkOhRGgGzQDIRearpy0jzDNASOy+BVMn+iZ3RnY9rB6yHeUVX 5pcD/JSZKCqIKcRyQiSNT4OCagAkeVyIVEdgN510t/SA1ke6TlQH/WF0D1l3cocJ nu9Q0HJtXpeMJ79CJar4t4EUEsnpsOndBtxDyeeu9K+NcwGpp09cg0/XXvXJFa20 TRHeSLPGT0DfHKVdICKHIDJRB6DbTT0nKzka3Ief6gMjl8CwN8fX6p+4KpzUr82a S2LFxijWNMCZetxTOwkksdaxKB7evDSfq2Bb6WZrpc8+6NI9+Ecfhu/btlDgqP8b B1vMRdzv+Q1FtxPLYTBPcQ7nOxG5O8lNMSRgQr50JT7/j//YjU3QiKoHnw04kKkz MyGrf5zMIKjXY60e2y3TDLPXjEhJRJ11C7aq6qaHbrr7tkexH6Nc8sWFjKcKc436 gN/EvmxsbtugxmSpcpDfWWhEoq2lZU7t6h4I8UM3zMKrx38GQdxVJgPSorMKCv5Z moLnsaoL2sVVWI8DHxKcIRVO1k+m0JkVNj6eAfutsu13MUH3m6yP6I56ZooHh6Ir AagNncb2g/m8hFYmunXC/LT7C00vq00cIKSJWhC8loFD+rP6NcFSBQ6diiXR+uPu LQBajWSlDQreV6qJfRXcHupI59FgZhD0VvZInXvc7VwUgsdwfPAbY0SuXSVXAHgE rUQ183bslSLDBUITJhx3jt4zpmq6UfcB6zzxNAP7b6sAK8VILMt2Y/kzJ8eV72Fq XBO2SMyrg6dxhzgjv5Wy4dPMh0atYFeXGreG4ButSIDEQmKmgg9VaNp/YPAAiGwl 8dc+b1Y/i3cVlxgPlUw+0hu9i5HZS4IWrmrmExXlUsqtCiZ6poEnoDCisaa6T8as l00L =REPk -----END PGP SIGNATURE----- Johannes Löthberg (41): Initial commit Add COPYING [Forgot to include lib/] Missed BASH_SHELL check Distribute README.md Fix up dist/distcheck Migrate updpkgsums Update README.md README: Add build instructions Migrate paccache Migrate paclist paccache: Fix m4_includes Migrate pacdiff Migrate paclog-pkglist Migrate pacscripts README: Reorder alphabetically Migrate rankmirrors Add AUTHORS.md Add vim ftplugin/syntax Add --with-vim-dir configure flag add lib/parseopts.sh checkupdates: Make sure spaces in DBPath are handled Migrate pacsearch src/Makefile.am: Add lib dependencies to targets configure.ac: add missing SIZECMD paccache: Exit when privilege escalation fails paccache: Enable nullglob README: Add pacsearch paccache: Support multiple CacheDirs README: Add localestatedir to example configure command src/Makefile.am: Add configure_input to sed command Add pactree configure.ac: Update ML address configure.ac: Redo vimdir configure: Add debug and warnings pactree: Mark globals static configure.ac: Print configuration variables Initial setup for docs Add pactree manpage doc: Add gitignore Update version to 0.0.1 ----------------------------------------------------------------------- This annotated tag includes the following new commits: new 3035223 Update version to 0.0.1 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: * 3035223 (tag: v0.0.1) Update version to 0.0.1 Detailed log of new commits: commit 303522363f3caec28b064a55651950924680cc31 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Oct 17 13:57:50 2016 +0200 Update version to 0.0.1 Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0