diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-12-01 22:53:13 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-12-06 13:14:49 +0000 |
| commit | c932d79eda7f881d5421fcedcc00163d610c01d2 (patch) | |
| tree | c953039eb38abc22bbc861a1ab7985ab2c014382 /tests/data | |
| parent | 493366749ac2e5e7ed856dc0c1cea4471bfdea83 (diff) | |
| download | qtapplicationmanager-c932d79eda7f881d5421fcedcc00163d610c01d2.tar.gz | |
Fixed auto-tests on macOS
"HFS+ requires filenames to be in decomposed form (LATIN SMALL LETTER A +
COMBINING DIAERESIS) instead of composed form (LATIN SMALL LETTER A WITH
DIAERESIS)."
This means we have to normalize the file name encoding to be cross-platform
compatible when creating/extracting packages.
Change-Id: I01b3b1ed449be89745b3975426dcff98edb91dd2
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'tests/data')
| -rwxr-xr-x | tests/data/create-test-packages.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/data/create-test-packages.sh b/tests/data/create-test-packages.sh index 8a9d1288..637f437e 100755 --- a/tests/data/create-test-packages.sh +++ b/tests/data/create-test-packages.sh @@ -27,8 +27,10 @@ ## ############################################################################# +#set -x + # check basic requirement -[ "${LANG%%.UTF-8}" = "$LANG" ] && ( echo "The application-packager needs to be run with UTF-8 locale variant"; exit 1; ) +[ "$(uname)" != "Darwin" ] && [ "${LANG%%.UTF-8}" = "$LANG" ] && ( echo "The application-packager needs to be run with UTF-8 locale variant"; exit 1; ) [ ! -d certificates ] && ( echo "Please cd to the tests/data directory before running this script"; exit 1; ) # having $LC_ALL set to "C" will screw us big time - especially since QtCreator sets this @@ -43,9 +45,10 @@ usage() exit 1 } -PACKAGER="$1" +PACKAGER="${@: -1}" [ ! -x "$PACKAGER" ] && usage +eval ${@:1:$# - 1} "$PACKAGER" --version 2>/dev/null | grep -qsi "Packager" || usage ( cd certificates && ./create-test-certificates.sh ) |