diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-17 17:12:55 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-17 17:12:55 (EDT) |
| commit | 529fb12cb56c379a3364a731201e411300b6ad7a (patch) | |
| tree | 49c364e246f6203f82f5ef21cc46060536c4f697 /tests/exe | |
| parent | 9906f96c9acbf9cbce91ca7cca5beab2e43574f8 (diff) | |
tests/aux/common.sh: Set SPF 2.0 env vars
Don't bother setting these in every test script.
Also set a non-native package version in tests/aux/setup.sh.
Diffstat (limited to 'tests/exe')
| -rwxr-xr-x | tests/exe/ob-buildenv.sh | 37 | ||||
| -rwxr-xr-x | tests/exe/ob-unpacksource.sh | 6 |
2 files changed, 20 insertions, 23 deletions
diff --git a/tests/exe/ob-buildenv.sh b/tests/exe/ob-buildenv.sh index 4440fd2..3720207 100755 --- a/tests/exe/ob-buildenv.sh +++ b/tests/exe/ob-buildenv.sh @@ -24,22 +24,21 @@ set -eu plan_ 1 -OPK_BUILD_ARCH='amd64-linux-glibc' OPK_HOST_ARCH='i686-linux-glibc' \ - cmd_is 'ob-buildenv' ob-buildenv <<-EOF - PATH='${PATH}' - AR='i686-linux-glibc-ar' - AS='i686-linux-glibc-as' - CC='i686-linux-glibc-gcc' - CPP='i686-linux-glibc-cpp' - CXX='i686-linux-glibc-g++' - LD='i686-linux-glibc-ld' - NM='i686-linux-glibc-nm' - OBJCOPY='i686-linux-glibc-objcopy' - OBJDUMP='i686-linux-glibc-objdump' - RANLIB='i686-linux-glibc-ranlib' - READELF='i686-linux-glibc-readelf' - SIZE='i686-linux-glibc-size' - STRINGS='i686-linux-glibc-strings' - STRIP='i686-linux-glibc-strip' - OPK_TOOL_PREFIX='i686-linux-glibc-' - EOF +cmd_is 'ob-buildenv' ob-buildenv <<-EOF + PATH='${PATH}' + AR='i686-linux-glibc-ar' + AS='i686-linux-glibc-as' + CC='i686-linux-glibc-gcc' + CPP='i686-linux-glibc-cpp' + CXX='i686-linux-glibc-g++' + LD='i686-linux-glibc-ld' + NM='i686-linux-glibc-nm' + OBJCOPY='i686-linux-glibc-objcopy' + OBJDUMP='i686-linux-glibc-objdump' + RANLIB='i686-linux-glibc-ranlib' + READELF='i686-linux-glibc-readelf' + SIZE='i686-linux-glibc-size' + STRINGS='i686-linux-glibc-strings' + STRIP='i686-linux-glibc-strip' + OPK_TOOL_PREFIX='i686-linux-glibc-' + EOF diff --git a/tests/exe/ob-unpacksource.sh b/tests/exe/ob-unpacksource.sh index 375bb1e..ddc382a 100755 --- a/tests/exe/ob-unpacksource.sh +++ b/tests/exe/ob-unpacksource.sh @@ -33,8 +33,7 @@ plan_ 4 mkdir -p '../src/src/' printf '%s' "${FOO_SH}" >'../src/src/foo.sh' -OPK_SOURCE='foo' OPK_SOURCE_VERSION_UPSTREAM='1.0' \ - command_ok_ 'ob-unpacksource exit status' ob-unpacksource +command_ok_ 'ob-unpacksource exit status' ob-unpacksource cmd_is 'native sources unpacked' cat 'src/src/foo.sh' <<-EOF ${FOO_SH} EOF @@ -45,8 +44,7 @@ mv '../src/' 'foo/' tar -czf '../foo-1.0.orig.tar.gz' 'foo/' rm -Rf 'foo/' -OPK_SOURCE='foo' OPK_SOURCE_VERSION_UPSTREAM='1.0' \ - command_ok_ 'ob-unpacksource exit status' ob-unpacksource +command_ok_ 'ob-unpacksource exit status' ob-unpacksource cmd_is 'upstream sources unpacked' cat 'src/src/foo.sh' <<-EOF ${FOO_SH} EOF |