summaryrefslogtreecommitdiff
path: root/tests/data/create-test-packages.sh
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2019-04-03 00:48:22 +0200
committerRobert Griebl <robert.griebl@pelagicore.com>2019-08-01 11:23:31 +0200
commitb4aee167d3bc6b9f64229317fbc428b3f3b83c0d (patch)
tree6b526d57203f34f4b85a82e2e958ace227c83960 /tests/data/create-test-packages.sh
parent3bc3dc4c8e912beb18aec7ab84af40c0129d84c0 (diff)
downloadqtapplicationmanager-b4aee167d3bc6b9f64229317fbc428b3f3b83c0d.tar.gz
Add new package abstraction, which allows multiple executables per package
This is part 1 which is missing doc updates and missing the update-builtin- applications functionality. Both will be added in a follow-up commit. Change-Id: I2b493cfb7585143962067674690b02cc132ef78b Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'tests/data/create-test-packages.sh')
-rwxr-xr-xtests/data/create-test-packages.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/data/create-test-packages.sh b/tests/data/create-test-packages.sh
index 8355e462..023183b9 100755
--- a/tests/data/create-test-packages.sh
+++ b/tests/data/create-test-packages.sh
@@ -78,8 +78,10 @@ mkdir -p "$src"
packager()
{
+ set +e
packagerOutput=`"$PACKAGER" "$@" 2>&1`
packagerResult=$?
+ set -e
if [ $packagerResult -ne 0 ]; then
echo -e "`basename $PACKAGER`$R failed with exit code $packagerResult$W. The executed command was:"
echo
@@ -185,7 +187,7 @@ echo "invalid" >"$dst/test-invalid-format.appkg"
info "Create a package with an invalid formatVersion header field"
mv "$src"/--PACKAGE-HEADER--{,.orig}
-echo '{formatType: "am-package-header", formatVersion: 2}' >$src/--PACKAGE-HEADER--
+sed <"$src/--PACKAGE-HEADER--.orig" >"$src/--PACKAGE-HEADER--" 's/formatVersion: 2/formatVersion: X/'
tar -C "$src" -cf "$dst/test-invalid-header-formatversion.appkg" -- --PACKAGE-HEADER-- info.yaml icon.png test --PACKAGE-FOOTER--
mv "$src"/--PACKAGE-HEADER--{.orig,}
@@ -197,13 +199,13 @@ mv "$src"/--PACKAGE-HEADER--{.orig,}
info "Create a package with an invalid id header field"
mv "$src"/--PACKAGE-HEADER--{,.orig}
-sed <"$src/--PACKAGE-HEADER--.orig" >"$src/--PACKAGE-HEADER--" "s/applicationId: '[a-z0-9.-]*'/applicationId: ':invalid'/"
+sed <"$src/--PACKAGE-HEADER--.orig" >"$src/--PACKAGE-HEADER--" "s/packageId: '[a-z0-9.-]*'/packageId: ':invalid'/"
tar -C "$src" -cf "$dst/test-invalid-header-id.appkg" -- --PACKAGE-HEADER-- info.yaml icon.png test --PACKAGE-FOOTER--
mv "$src"/--PACKAGE-HEADER--{.orig,}
info "Create a package with a non-matching id header field"
mv "$src"/--PACKAGE-HEADER--{,.orig}
-sed <"$src/--PACKAGE-HEADER--.orig" >"$src/--PACKAGE-HEADER--" "s/applicationId: '[a-z0-9.-]*'/applicationId: 'non-matching'/"
+sed <"$src/--PACKAGE-HEADER--.orig" >"$src/--PACKAGE-HEADER--" "s/packageId: '[a-z0-9.-]*'/packageId: 'non-matching'/"
tar -C "$src" -cf "$dst/test-non-matching-header-id.appkg" -- --PACKAGE-HEADER-- info.yaml icon.png test --PACKAGE-FOOTER--
mv "$src"/--PACKAGE-HEADER--{.orig,}