From 4f3f7605375368be86d737e37dcca254c2cc2c0e Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 17 Mar 2019 01:51:36 -0400 Subject: tests/aux/common.sh: Move is() from tests/lib/ob_parse_changelog.sh --- (limited to 'tests') diff --git a/tests/aux/common.sh b/tests/aux/common.sh new file mode 100644 index 0000000..fce9d07 --- /dev/null +++ b/tests/aux/common.sh @@ -0,0 +1,35 @@ +# Functions common to tests +# +# Copyright (C) 2018 Patrick McDermott +# +# This file is part of opkbuild. +# +# opkbuild 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 3 of the License, or +# (at your option) any later version. +# +# opkbuild 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 opkbuild. If not, see . + +is() +{ + local description="${1}" + local got="${2}" + local expected="${3}" + shift 3 + + if [ "x${got}" = "x${expected}" ]; then + ok_ -- "${description}" + else + not_ok_ -- "${description}" + diag_ " Failed test '${description}'" + diag_ " got: '${got}'" + diag_ " expected: '${expected}'" + fi +} diff --git a/tests/lib/ob_parse_changelog.sh b/tests/lib/ob_parse_changelog.sh index 15be4e1..837d29b 100755 --- a/tests/lib/ob_parse_changelog.sh +++ b/tests/lib/ob_parse_changelog.sh @@ -20,6 +20,7 @@ set -eu . "${TOP_SRCDIR}/tests/aux/tap-functions.sh" +. "${TOP_SRCDIR}/tests/aux/common.sh" . "${TOP_BUILDDIR}/lib/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}" CHANGELOG='\ @@ -51,23 +52,6 @@ plan_ 19 entry=0 -is() -{ - local description="${1}" - local got="${2}" - local expected="${3}" - shift 3 - - if [ "x${got}" = "x${expected}" ]; then - ok_ -- "${description}" - else - not_ok_ -- "${description}" - diag_ " Failed test '${description}'" - diag_ " got: '${got}'" - diag_ " expected: '${expected}'" - fi -} - entry_1() { local source="${1}" -- cgit v0.9.1