diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/aux/common.sh | 2 | ||||
| -rw-r--r-- | tests/aux/setup.sh | 62 | ||||
| -rw-r--r-- | tests/local.mk | 1 |
3 files changed, 2 insertions, 63 deletions
diff --git a/tests/aux/common.sh b/tests/aux/common.sh index 15503c8..236b6d9 100644 --- a/tests/aux/common.sh +++ b/tests/aux/common.sh @@ -102,4 +102,6 @@ export OPK_HOST_ARCH_LIBS='glibc' export OPK_HOST_PLAT='x60' # Section 7.3.3 Toolchain Variables aren't used by opkbuild utilities. +rm -Rf "${TOP_BUILDDIR}/tests/pkg/tmp/" +mkdir -p "${TOP_BUILDDIR}/tests/pkg/tmp/" cd "${TOP_BUILDDIR}/tests/pkg/tmp/" diff --git a/tests/aux/setup.sh b/tests/aux/setup.sh deleted file mode 100644 index 6b2c95c..0000000 --- a/tests/aux/setup.sh +++ /dev/null @@ -1,62 +0,0 @@ -# Test package setup -# -# Copyright (C) 2019 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 <http://www.gnu.org/licenses/>. - -set -eu - -MAINTAINER='"J. Random Hacker" <jrandom@example.com>' - -cd "${1}" - -rm -Rf 'pkg/' -mkdir -p 'pkg/tmp/' -cd 'pkg/' - -cat >'format' <<-EOF - 2.0 - EOF - -cat >'control' <<-EOF - Maintainer: ${MAINTAINER} - EOF - -cat >'changelog' <<-EOF - foo (1.0-1) trunk - * Initial release. - -- ${MAINTAINER} Thu, 01 Jan 1970 00:00:00 +0000 - EOF - -FOO_SH="$(cat <<-'EOF' - #!/bin/sh - printf 'Hello, world!\n' - EOF - )" - -mkdir -p '../src/src/' -printf '%s\n' "${FOO_SH}" >'../src/src/foo.sh' - -mkdir 'patches/' -cat >'patches/01_goodbye.patch' <<-'EOF' - diff -Naur a/src/foo.sh b/src/foo.sh - --- a/src/foo.sh - +++ b/src/foo.sh - @@ -1,2 +1,2 @@ - #!/bin/sh - -printf 'Hello, world!\n' - +printf 'Goodbye, world!\n' - EOF diff --git a/tests/local.mk b/tests/local.mk index 517dba9..0438f58 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -11,7 +11,6 @@ TESTS = \ %reldir%/exe/ob-applypatches.sh TEST_EXTENSIONS = .sh SH_LOG_DRIVER = \ - $(SHELL) $(top_srcdir)/tests/aux/setup.sh "$(top_builddir)/tests" && \ AM_TAP_AWK='$(AWK)' \ TOP_SRCDIR="$(abs_top_srcdir)" \ TOP_BUILDDIR="$(abs_top_builddir)" \ |