From b5239823b94f07896c61ad1e0e03d99abaa81732 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jan 02 2019 10:58:43 +0000 Subject: Enable java-1.6.0-openjdk test for armhfp --- diff --git a/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh b/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh index fece3c8..6304a31 100755 --- a/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh +++ b/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh @@ -1,14 +1,8 @@ #!/bin/bash # Author: Christoph Galuschka -uname_arch=$(uname -m) - -if [ "$uname_arch" == "armv7l" ]; then - t_Log "*** Not testing on Arch: $uname_arch ***" - exit 0 -fi -# Install python -if (t_GetArch | grep -qE 'aarch64|armv7hl|ppc64le') +# Install java +if (t_GetArch | grep -qE 'aarch64|ppc64le') then echo "Package not included for current arch, skipping" exit 0 diff --git a/tests/p_java-1.6.0-openjdk/10-test_java.sh b/tests/p_java-1.6.0-openjdk/10-test_java.sh index fd02adf..526428e 100755 --- a/tests/p_java-1.6.0-openjdk/10-test_java.sh +++ b/tests/p_java-1.6.0-openjdk/10-test_java.sh @@ -1,14 +1,7 @@ #!/bin/sh # Author: Christoph Galuschka -uname_arch=$(uname -m) - -if [ "$uname_arch" == "armv7l" ]; then - t_Log "*** Not testing on Arch: $uname_arch ***" - exit 0 -fi - -if (t_GetArch | grep -qE 'aarch64|armv7hl|ppc64le') +if (t_GetArch | grep -qE 'aarch64|ppc64le') then echo "Package not included for current arch, skipping" exit 0