diff --git a/tests/p_bash/bash_version_info_test.sh b/tests/p_bash/bash_version_info_test.sh index 7dabba5..988910e 100755 --- a/tests/p_bash/bash_version_info_test.sh +++ b/tests/p_bash/bash_version_info_test.sh @@ -5,6 +5,6 @@ t_Log "Running $0 - check that bash version info is the same with upstream." -bash --version | grep -qE "(i386|i686|x86_64|aarch64|armv7hl)-redhat-linux-gnu" +bash --version | grep -qE "(i386|i686|x86_64|aarch64|armv7hl|powerpc64le|powerpc64)-redhat-linux-gnu" t_CheckExitStatus $? diff --git a/tests/p_grub2/01_grub2_secureboot_signed.sh b/tests/p_grub2/01_grub2_secureboot_signed.sh index 002dc3c..899a2de 100755 --- a/tests/p_grub2/01_grub2_secureboot_signed.sh +++ b/tests/p_grub2/01_grub2_secureboot_signed.sh @@ -3,12 +3,14 @@ t_Log "Running $0 - Verifying that grub2-efi is correctly signed with correct cert" -if [ "$centos_ver" = "7" ] ; then +arch=$(uname -m) + +if [[ "$centos_ver" = "7" && "$arch" = "x86_64" ]] ; then t_InstallPackage pesign grub2-efi pesign --show-signature --in /boot/efi/EFI/centos/grubx64.efi|grep -q 'Red Hat Inc.' t_CheckExitStatus $? else - t_log "previous versions than CentOS 7 aren't using secureboot ... skipping" + t_Log "previous versions than CentOS 7 - or not x86_64 arch - aren't using secureboot ... skipping" exit 0 fi 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 fe40a7a..cee4163 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 @@ -2,9 +2,9 @@ # Author: Christoph Galuschka # Install python -if (t_GetArch | grep -qE 'aarch64') +if (t_GetArch | grep -qE 'aarch64|armv7hl') then - echo "Package not included with AArch64, skipping" + echo "Package not included for current arch, skipping" exit 0 fi 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 6cf7d9a..75cf358 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,9 +1,9 @@ #!/bin/sh # Author: Christoph Galuschka -if (t_GetArch | grep -qE 'aarch64') +if (t_GetArch | grep -qE 'aarch64|armv7hl') then - echo "Package not included with AArch64, skipping" + echo "Package not included for current arch, skipping" exit 0 fi diff --git a/tests/p_kernel/02_kernel_secureboot_signed.sh b/tests/p_kernel/02_kernel_secureboot_signed.sh index ec236aa..b538968 100755 --- a/tests/p_kernel/02_kernel_secureboot_signed.sh +++ b/tests/p_kernel/02_kernel_secureboot_signed.sh @@ -3,7 +3,7 @@ t_Log "Running $0 - Verifying that kernel is correctly signed with correct cert" -if [ "$centos_ver" = "7" ] ; then +if [[ "$centos_ver" = "7" && "$arch" = "x86_64" ]] ; then t_InstallPackage pesign for kernel in $(rpm -q kernel --queryformat '%{version}-%{release}.%{arch}\n') do @@ -12,7 +12,7 @@ if [ "$centos_ver" = "7" ] ; then t_CheckExitStatus $? done else - t_log "previous versions than CentOS 7 aren't using secureboot ... skipping" + t_Log "previous versions than CentOS 7 - or not x86_64 -aren't using secureboot ... skipping" exit 0 fi