x86/cet: fix shadow stack test scripts

Message ID 20240205202239.825075-1-mjeanson@efficios.com
State Committed
Commit 155bb9d036646138348fee0ac045de601811e0c5
Headers
Series x86/cet: fix shadow stack test scripts |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed

Commit Message

Michael Jeanson Feb. 5, 2024, 8:22 p.m. UTC
  Some shadow stack test scripts use the '==' operator with the 'test'
command to validate exit codes resulting in the following error:

  sysdeps/x86_64/tst-shstk-legacy-1e.sh: 31: test: 139: unexpected operator

The '==' operator is invalid for the 'test' command, use '-eq' like the
previous call to 'test'.

Change-Id: Ib4d444cc1c9bbb9626d5ab3a40a427faf3567e12
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 sysdeps/x86_64/tst-shstk-legacy-1e-static.sh | 2 +-
 sysdeps/x86_64/tst-shstk-legacy-1e.sh        | 2 +-
 sysdeps/x86_64/tst-shstk-legacy-1g.sh        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
  

Comments

H.J. Lu Feb. 6, 2024, 2:10 a.m. UTC | #1
On Mon, Feb 5, 2024 at 12:23 PM Michael Jeanson <mjeanson@efficios.com> wrote:
>
> Some shadow stack test scripts use the '==' operator with the 'test'
> command to validate exit codes resulting in the following error:
>
>   sysdeps/x86_64/tst-shstk-legacy-1e.sh: 31: test: 139: unexpected operator
>
> The '==' operator is invalid for the 'test' command, use '-eq' like the
> previous call to 'test'.
>
> Change-Id: Ib4d444cc1c9bbb9626d5ab3a40a427faf3567e12
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
>  sysdeps/x86_64/tst-shstk-legacy-1e-static.sh | 2 +-
>  sysdeps/x86_64/tst-shstk-legacy-1e.sh        | 2 +-
>  sysdeps/x86_64/tst-shstk-legacy-1g.sh        | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh b/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh
> index 46f1233757..0a9a164a3e 100755
> --- a/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh
> +++ b/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh
> @@ -26,7 +26,7 @@ ${common_objpfx}elf/tst-shstk-legacy-1e-static
>  status=$?
>  if test $status -eq 77; then
>    exit 77
> -elif test $status == 139; then
> +elif test $status -eq 139; then
>    exit 0
>  else
>    exit 1
> diff --git a/sysdeps/x86_64/tst-shstk-legacy-1e.sh b/sysdeps/x86_64/tst-shstk-legacy-1e.sh
> index 31212453d9..3dec5623e4 100755
> --- a/sysdeps/x86_64/tst-shstk-legacy-1e.sh
> +++ b/sysdeps/x86_64/tst-shstk-legacy-1e.sh
> @@ -28,7 +28,7 @@ ${test_program_prefix} \
>  status=$?
>  if test $status -eq 77; then
>    exit 77
> -elif test $status == 139; then
> +elif test $status -eq 139; then
>    exit 0
>  else
>    exit 1
> diff --git a/sysdeps/x86_64/tst-shstk-legacy-1g.sh b/sysdeps/x86_64/tst-shstk-legacy-1g.sh
> index e84087068e..249831e816 100755
> --- a/sysdeps/x86_64/tst-shstk-legacy-1g.sh
> +++ b/sysdeps/x86_64/tst-shstk-legacy-1g.sh
> @@ -28,7 +28,7 @@ ${test_program_prefix} \
>  status=$?
>  if test $status -eq 77; then
>    exit 77
> -elif test $status == 139; then
> +elif test $status -eq 139; then
>    exit 0
>  else
>    exit 1
> --
> 2.34.1
>

LGTM.

Thanks.
  

Patch

diff --git a/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh b/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh
index 46f1233757..0a9a164a3e 100755
--- a/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh
+++ b/sysdeps/x86_64/tst-shstk-legacy-1e-static.sh
@@ -26,7 +26,7 @@  ${common_objpfx}elf/tst-shstk-legacy-1e-static
 status=$?
 if test $status -eq 77; then
   exit 77
-elif test $status == 139; then
+elif test $status -eq 139; then
   exit 0
 else
   exit 1
diff --git a/sysdeps/x86_64/tst-shstk-legacy-1e.sh b/sysdeps/x86_64/tst-shstk-legacy-1e.sh
index 31212453d9..3dec5623e4 100755
--- a/sysdeps/x86_64/tst-shstk-legacy-1e.sh
+++ b/sysdeps/x86_64/tst-shstk-legacy-1e.sh
@@ -28,7 +28,7 @@  ${test_program_prefix} \
 status=$?
 if test $status -eq 77; then
   exit 77
-elif test $status == 139; then
+elif test $status -eq 139; then
   exit 0
 else
   exit 1
diff --git a/sysdeps/x86_64/tst-shstk-legacy-1g.sh b/sysdeps/x86_64/tst-shstk-legacy-1g.sh
index e84087068e..249831e816 100755
--- a/sysdeps/x86_64/tst-shstk-legacy-1g.sh
+++ b/sysdeps/x86_64/tst-shstk-legacy-1g.sh
@@ -28,7 +28,7 @@  ${test_program_prefix} \
 status=$?
 if test $status -eq 77; then
   exit 77
-elif test $status == 139; then
+elif test $status -eq 139; then
   exit 0
 else
   exit 1