From b0841268bd8de29d4bb5f7b03dbf9c000d556d88 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 28 Sep 2016 20:18:05 +0200
Subject: [PATCH] Update Travis testsuite.

---
 .circle.yml                                   |   2 +-
 .github/travis_testsuite_1.sh                 | 206 ++++++++++++++++++
 ...vis_testsuite.sh => travis_testsuite_2.sh} |   1 +
 .travis.yml                                   |   2 +-
 4 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 .github/travis_testsuite_1.sh
 rename .github/{travis_testsuite.sh => travis_testsuite_2.sh} (99%)

diff --git a/.circle.yml b/.circle.yml
index 00f679d6..d18fe31a 100644
--- a/.circle.yml
+++ b/.circle.yml
@@ -27,6 +27,6 @@ dependencies:
 
 test:
   override:
-    - bash ./.github/travis_testsuite.sh
+    - bash ./.github/travis_testsuite_1.sh
 
 # vim:set ts=2 sw=2 et:
diff --git a/.github/travis_testsuite_1.sh b/.github/travis_testsuite_1.sh
new file mode 100644
index 00000000..cbd48ab4
--- /dev/null
+++ b/.github/travis_testsuite_1.sh
@@ -0,0 +1,206 @@
+#! /bin/bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+
+# Support for Travis CI -- https://travis-ci.org/upx/upx/builds
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+source ./.github/travis_init.sh || exit 1
+
+
+testsuite_header() {
+    local x="======================================================"
+    echo -e "\n${x}\n${1}\n${x}\n"
+}
+
+testsuite_split_f() {
+    fd= fb= fs= fe= fsubdir=
+    fd=$(dirname "$1")
+    fb=$(basename "$1")
+    # fs: short basename - remove known executable extensions
+    fs=$fb
+    case $fb in *.com | *.dll | *.exe | *.out | *.so | *.sys | *.ttp)
+        fs="${fb%.*}"
+        fe=".${fb##*.}"
+    esac
+    fsubdir=$(basename "$fd")
+    # sanity checks
+    if [[ -d $f || -z $fsubdir || -z $fs ]]; then
+        fd= fb= fs= fe= fsubdir=
+    fi
+}
+
+testsuite_check_sha() {
+    (cd "$1" && LC_ALL=C $sha256sum -b */* > .sha256sums.current)
+    cat $1/.sha256sums.current
+    if ! cmp -s $1/.sha256sums.current $1/.sha256sums.expected; then
+        diff -u $1/.sha256sums.current $1/.sha256sums.expected || true
+        exit 1
+    fi
+}
+
+testsuite_run_compress() {
+    testsuite_header "$t"
+    local f ff
+    for f in $upx_testsuite_SRCDIR/files/packed/*/upx-3.91*; do
+        testsuite_split_f "$f"
+        [[ -z $fb ]] && continue
+        mkdir -p $t/$fsubdir
+        ff=t01_decompressed/$fsubdir/$fb
+        $upx --prefer-ucl "$@" $ff -o $t/$fsubdir/$fb
+    done
+    testsuite_check_sha "$t"
+    $upx -l $t/*/*
+    $upx --file-info $t/*/*
+    $upx -t $t/*/*
+}
+
+
+
+#set -x
+
+cd $upx_BUILDDIR || exit 1
+if [[ $ALLOW_FAIL == 1 ]]; then
+    echo "ALLOW_FAIL=$ALLOW_FAIL"
+    set +e
+    if [[ ! -x $PWD/upx.out ]]; then exit 0; fi
+fi
+if [[ ! -x $PWD/upx.out ]]; then exit 1; fi
+
+#
+# very first version of the upx-testsuite
+#
+
+exit_code=0
+
+sha256sum=sha256sum
+if [[ $TRAVIS_OS_NAME == osx ]]; then
+    sha256sum=gsha256sum # brew install coreutils
+fi
+upx=$PWD/upx.out
+if [[ $B =~ (^|\+)valgrind($|\+) ]]; then
+    upx="valgrind --leak-check=full --show-reachable=yes $upx"
+fi
+upx_391=
+if [[ $TRAVIS_OS_NAME == linux ]]; then
+    rm -f upx391.out
+    cp $upx_testsuite_SRCDIR/files/packed/amd64-linux.elf/upx-3.91 upx391.out
+    upx_391="$PWD/upx391.out --fake-stub-version=3.92 --fake-stub-year=2016"
+fi
+
+if [[ $B =~ (^|\+)coverage($|\+) ]]; then
+    lcov -d $upx_BUILDDIR --zerocounters
+fi
+
+cd $upx_testsuite_BUILDDIR || exit 1
+rm -rf ./testsuite_1
+mkdir testsuite_1
+cd testsuite_1
+
+export UPX=
+export UPX="--no-progress"
+
+#
+# test 01
+#
+
+t=t01_decompressed
+mkdir $t; echo -n "\
+24158f78c34c4ef94bb7773a6dda7231d289be76c2f5f60e8b9ddb3f800c100e *amd64-linux.elf/upx-3.91
+b1c1c38d50007616aaf8e942839648c80a6111023e0b411e5fa7a06c543aeb4a *armeb-linux.elf/upx-3.91
+28d7ca8f0dfca8159e637eaf2057230b6e6719e07751aca1d19a45b5efed817c *arm-wince.pe/upx-3.91.exe
+bcac77a287289301a45fde9a75e4e6c9ad7f8d57856bae6eafaae12ae4445a34 *i386-dos32.djgpp2.coff/upx-3.91.exe
+730a513b72a094697f827e4ac1a4f8ef58a614fc7a7ad448fa58d60cd89af7ed *i386-linux.elf/upx-3.91
+0dbc3c267ca8cd35ee3ea138b59c8b1ae35872c918be6d17df1a892b75710f9b *i386-win32.pe/upx-3.91.exe
+8e5333ea040f5594d3e67d5b09e005d52b3a52ef55099a7c11d7e39ead38e66d *m68k-atari.tos/upx-3.91.ttp
+c3f44b4d00a87384c03a6f9e7aec809c1addfe3e271244d38a474f296603088c *mipsel-linux.elf/upx-3.91
+b8c35fa2956da17ca505956e9f5017bb5f3a746322647e24ccb8ff28059cafa4 *powerpc-linux.elf/upx-3.91
+" > $t/.sha256sums.expected
+testsuite_header "$t"
+for f in $upx_testsuite_SRCDIR/files/packed/*/upx-3.91*; do
+    testsuite_split_f "$f"
+    [[ -z $fb ]] && continue
+    mkdir -p $t/$fsubdir
+    $upx -d $f -o $t/$fsubdir/$fb
+done
+testsuite_check_sha "$t"
+
+#
+# test 02
+#
+
+
+t=t02_compress_ucl_3_no_filter
+mkdir $t; echo -n "\
+3dd2564078aa15d35fbf70928cdb094697c4ef8909bd711c7a3bd79eb18ab400 *amd64-linux.elf/upx-3.91
+ea42d52676d2698f29587e98a9e1536b96ebf523a7d8bc926f6c241a159b4116 *armeb-linux.elf/upx-3.91
+16c0493d4d89e6c581748826afd26d2b4caeeae6074b0bdcf55747a4bc9777a5 *arm-wince.pe/upx-3.91.exe
+27f1afd1e1fec37d4dcd43163b9ec60a6af3abeab21a4adf539b7faea848eb20 *i386-dos32.djgpp2.coff/upx-3.91.exe
+5edf3dcfd0458b0f23c19e6c44b4c54a5457bc34c3bf045b37678d4f96301e00 *i386-linux.elf/upx-3.91
+a94d5ff62c061d60d64e838ea4bb7610a75cf26a0761b26f9da0efbd38e87ebe *i386-win32.pe/upx-3.91.exe
+510e2cd126bb8129b9076eb61e1ad3308d9af109cd42dff7252bf43e1e3552ea *m68k-atari.tos/upx-3.91.ttp
+b61aa58e493b3961646e5c0bcb7f19f74b439fe8f5c934db25b00f97f51a05d0 *mipsel-linux.elf/upx-3.91
+21071b7dfa542a7e3d6c6a3586b4b844d28270a2beccdc5d03f608a2e71b787d *powerpc-linux.elf/upx-3.91
+" > $t/.sha256sums.expected
+time testsuite_run_compress -3 --no-filter
+
+t=t03_compress_lzma_1_no_filter
+mkdir $t; echo -n "\
+542124e236f4dc3ba92de02a07f29df3d8a015bb9f3a5a9681c978746b16e0df *amd64-linux.elf/upx-3.91
+07ca9736f1cd478bde2c8da95a6ecb95bd865dcf8ea48a396b13050ac40d196e *armeb-linux.elf/upx-3.91
+99ad77f2280a5b4791ead800c7d4d5b29aa49ce40319616f682c1b29ddf20702 *arm-wince.pe/upx-3.91.exe
+9e852e95b38ca57319d1e911bf97226a82b60dd336e201496c30bf62943aecce *i386-dos32.djgpp2.coff/upx-3.91.exe
+e408fbcbbe422c06fce0cfed5d28ea0f0ef7c1b9225bf1f5a7d789cc84fb93b8 *i386-linux.elf/upx-3.91
+e249633d550abe84953a15668e3d74660fd63e9e935bec8564d9df08116b015d *i386-win32.pe/upx-3.91.exe
+dd561ff9c530711be0934db352cf40f606066c280e27b26e7f8fd6dd1a087e6a *m68k-atari.tos/upx-3.91.ttp
+813536a8f1b8b8852ed52c560afce8b51612876ac5a3a9e51434d8677932ef7b *mipsel-linux.elf/upx-3.91
+5a3607a37534bab2a22c2e1dc3f1aa26144c2b75c261f092a3d9116d884edc1a *powerpc-linux.elf/upx-3.91
+" > $t/.sha256sums.expected
+time testsuite_run_compress -1 --lzma --no-filter
+
+t=t04_compress_ucl_2_all_filters
+mkdir $t; echo -n "\
+bde869b9b0e29c7930591b3582ef3e864db7757d774082d772df8f6b874e6fd6 *amd64-linux.elf/upx-3.91
+db894f24777334abb9bf8e34661d057e25c2889b46290cf83db7310c4cdd86fa *armeb-linux.elf/upx-3.91
+247e385b1bf2559982cfedde0dc6dafc3fe99ad09100afc8b6ec3e59722afd4f *arm-wince.pe/upx-3.91.exe
+33bde57c3f7ed8809bec0658fe6c48d047bdec97476643f2e8e2970ab0c4eb5f *i386-dos32.djgpp2.coff/upx-3.91.exe
+7f4ad752cab7db426356eb5068e37d06bade2422b6012069814dcfadae7e2cca *i386-linux.elf/upx-3.91
+32c7dd51179084d7191b57016dc9e508137f3e55ba59118dfbd1c4205f730790 *i386-win32.pe/upx-3.91.exe
+7b09fa5b2f8d85673f3a52c3b478a8dd129ed23681de4028625b33f5f6890942 *m68k-atari.tos/upx-3.91.ttp
+707b7f32b8b0c1a4e5c26e370b93ae6eb60ab78f7d6163b4e853eb94e69f5d14 *mipsel-linux.elf/upx-3.91
+3951a8dbe60f41f7ae1d71ca8d0f022675a04542786351c09281dfce41fd49e0 *powerpc-linux.elf/upx-3.91
+" > $t/.sha256sums.expected
+time testsuite_run_compress -2 --all-filters
+
+t=t05_compress_all_methods_1_no_filter
+mkdir $t; echo -n "\
+542124e236f4dc3ba92de02a07f29df3d8a015bb9f3a5a9681c978746b16e0df *amd64-linux.elf/upx-3.91
+07ca9736f1cd478bde2c8da95a6ecb95bd865dcf8ea48a396b13050ac40d196e *armeb-linux.elf/upx-3.91
+99ad77f2280a5b4791ead800c7d4d5b29aa49ce40319616f682c1b29ddf20702 *arm-wince.pe/upx-3.91.exe
+9e852e95b38ca57319d1e911bf97226a82b60dd336e201496c30bf62943aecce *i386-dos32.djgpp2.coff/upx-3.91.exe
+e408fbcbbe422c06fce0cfed5d28ea0f0ef7c1b9225bf1f5a7d789cc84fb93b8 *i386-linux.elf/upx-3.91
+e249633d550abe84953a15668e3d74660fd63e9e935bec8564d9df08116b015d *i386-win32.pe/upx-3.91.exe
+dd561ff9c530711be0934db352cf40f606066c280e27b26e7f8fd6dd1a087e6a *m68k-atari.tos/upx-3.91.ttp
+813536a8f1b8b8852ed52c560afce8b51612876ac5a3a9e51434d8677932ef7b *mipsel-linux.elf/upx-3.91
+5a3607a37534bab2a22c2e1dc3f1aa26144c2b75c261f092a3d9116d884edc1a *powerpc-linux.elf/upx-3.91
+" > $t/.sha256sums.expected
+time testsuite_run_compress -1 --all-methods --no-filter
+
+t=t06_compress_all_methods_no_lzma_no_filter
+mkdir $t; echo -n "\
+6e669ac40043287516be85ddce6e4ac9d41d4e550ea080e23f9dfde7fff8fd64 *amd64-linux.elf/upx-3.91
+b95b5a9a1ba4577df41c135b0061a7282e633f006ce6a5c729d73a708f80c0f0 *armeb-linux.elf/upx-3.91
+63be06791e4caa5ea530bd58d0fe5af7830fe6907cebb4de6eec5a73ff57bf58 *arm-wince.pe/upx-3.91.exe
+bbf7d2290c2aff5c914f14aaa7a089895888f3e25b468ba406f9723c046b0ccb *i386-dos32.djgpp2.coff/upx-3.91.exe
+b615ce3f45d7b727594c550cb2066fff154653ffd64a5329ee6723175224cc47 *i386-linux.elf/upx-3.91
+a647ed1aea16f58b544228279ad7159cd3ec5c3533efef1fd2df5a5a59b5d663 *i386-win32.pe/upx-3.91.exe
+4ce409cc6c1a0e26b0d5e361cd6ef7b0198830a3244235eff3edb18099d1ad22 *m68k-atari.tos/upx-3.91.ttp
+8b2b9f13dd613b62d9028d2c773a2633bb756a084e5620b3496449ffe1c2dc9e *mipsel-linux.elf/upx-3.91
+84e82cfffa594230ee44aa06937ccb088778c05d5d67985a314764385018f59d *powerpc-linux.elf/upx-3.91
+" > $t/.sha256sums.expected
+time testsuite_run_compress --all-methods --no-lzma --no-filter
+
+
+echo
+echo "UPX testsuite passed. All done."
+exit $exit_code
diff --git a/.github/travis_testsuite.sh b/.github/travis_testsuite_2.sh
similarity index 99%
rename from .github/travis_testsuite.sh
rename to .github/travis_testsuite_2.sh
index 9cdd0cb9..65380518 100644
--- a/.github/travis_testsuite.sh
+++ b/.github/travis_testsuite_2.sh
@@ -53,6 +53,7 @@ $upx -t          packed/*/upx-3.91*
 cd $upx_testsuite_BUILDDIR || exit 1
 rm -rf ./t
 for f in $upx_testsuite_SRCDIR/files/packed/*/upx-3.91*; do
+    [[ -d $f ]] && continue
     echo "===== $f"
     mkdir -p ./t
     if [[ -n $upx_391 ]]; then
diff --git a/.travis.yml b/.travis.yml
index 2927ead7..1ffa03b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -186,6 +186,6 @@ install:
 
 script:
   - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_build.sh
-  - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_testsuite.sh
+  - cd $TRAVIS_BUILD_DIR && bash ./.github/travis_testsuite_1.sh
 
 # vim:set ts=2 sw=2 et: