From 60a5b39d10b219e8762780dd4f41e809e3abeddf Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sun, 17 Mar 2019 17:48:06 -0400 Subject: tests/aux/setup.sh: Make source file Move from tests/exe/ob-unpacksource.sh. tests/aux/common.sh needs a copy of FOO_SH's definition for use by tests/exe/ob-unpacksource.sh. --- diff --git a/tests/aux/common.sh b/tests/aux/common.sh index 2ebdc9e..180e5f8 100644 --- a/tests/aux/common.sh +++ b/tests/aux/common.sh @@ -70,6 +70,12 @@ cmd_is() cd "${TOP_BUILDDIR}/tests/pkg/tmp/" +FOO_SH="$(cat <<-'EOF' + #!/bin/sh + printf 'Hello, world!\n' + EOF + )" + # SPF 2.0 environment variables: # # Section 7.3.1 Package Variables diff --git a/tests/aux/setup.sh b/tests/aux/setup.sh index ca91b8c..e16b3d6 100644 --- a/tests/aux/setup.sh +++ b/tests/aux/setup.sh @@ -40,3 +40,12 @@ cat >'changelog' <<-EOF * 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' diff --git a/tests/exe/ob-unpacksource.sh b/tests/exe/ob-unpacksource.sh index d443529..fbe94a2 100755 --- a/tests/exe/ob-unpacksource.sh +++ b/tests/exe/ob-unpacksource.sh @@ -22,16 +22,9 @@ set -eu . "${TOP_SRCDIR}/tests/aux/tap-functions.sh" . "${TOP_SRCDIR}/tests/aux/common.sh" -FOO_SH="$(cat <<-'EOF' - #!/bin/sh - printf 'Hello, world!\n' - EOF - )" - plan_ 4 -mkdir -p '../src/src/' -printf '%s\n' "${FOO_SH}" >'../src/src/foo.sh' +cp -Rp '../../src/' '../src/' command_ok_ 'ob-unpacksource exit status' ob-unpacksource cmd_is 'native sources unpacked' cat 'src/src/foo.sh' <<-EOF -- cgit v0.9.1