From a1a93442f2e8c639e046efb23b471cba491f6e0c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 26 Jul 2024 07:39:41 -0700
Subject: [PATCH] Fix testing the right targets on CI

This commit fixes a bug from the cmake migration where tests were not
actually testing the correct target. Object files were compiled with the
right options but the link step was missing both `--target` and
`-pthread` which caused everything to accidentally be tested as
`wasm32-wasi`. When fixing this one test was needed to have its stderr
updated because the component output of `wasm32-wasip2` is slightly
different. A timeout was additionally added because without `-pthread`
at the link step some tests infinitely ran which made debugging
difficult.
---
 ci/build.sh                                    | 3 ++-
 tests/CMakeLists.txt                           | 2 ++
 tests/general/sigabrt.c.stderr.expected        | 2 +-
 tests/general/sigabrt.c.stderr.expected.filter | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci/build.sh b/ci/build.sh
index 09c92a35f..7525aa4d4 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -47,4 +47,5 @@ if [ "$WASI_SDK_CI_SKIP_TESTS" = "1" ]; then
 fi
 
 # Run tests to ensure that the sysroot works.
-ctest --output-on-failure --parallel 10 --test-dir $build_dir/sysroot/tests
+ctest --output-on-failure --parallel 10 --test-dir $build_dir/sysroot/tests \
+  --timeout 60
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c5e7edd39..edbb1290d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -48,6 +48,7 @@ function(add_testcase runwasi test)
       # as well.
       if(NOT(CMAKE_C_COMPILER MATCHES ${target}))
         target_compile_options(${target_name} PRIVATE --target=${target})
+        target_link_options(${target_name} PRIVATE --target=${target})
       endif()
 
       # Apply test-specific compile options and link flags.
@@ -79,6 +80,7 @@ function(add_testcase runwasi test)
       # Apply target-specific options.
       if(target MATCHES threads)
         target_compile_options(${target_name} PRIVATE -pthread)
+        target_link_options(${target_name} PRIVATE -pthread)
       endif()
 
       if(runwasi)
diff --git a/tests/general/sigabrt.c.stderr.expected b/tests/general/sigabrt.c.stderr.expected
index 72c425d0c..d702a8897 100644
--- a/tests/general/sigabrt.c.stderr.expected
+++ b/tests/general/sigabrt.c.stderr.expected
@@ -3,4 +3,4 @@ Program received fatal signal: Aborted
 Error: failed to run main module `sigabrt.c.---.wasm`
 
 Caused by:
-    0: failed to invoke command default
+    0: failed to invoke ---
diff --git a/tests/general/sigabrt.c.stderr.expected.filter b/tests/general/sigabrt.c.stderr.expected.filter
index e6b54c2b2..726f0241e 100755
--- a/tests/general/sigabrt.c.stderr.expected.filter
+++ b/tests/general/sigabrt.c.stderr.expected.filter
@@ -4,4 +4,5 @@ set -euo pipefail
 cat \
     | sed -e 's/main module `.*sigabrt\.c\.wasm`/main module `sigabrt.c.---.wasm`/' \
     | sed -e 's/source location: @[[:xdigit:]]*$/source location: @----/' \
+    | sed -e 's/failed to invoke.*/failed to invoke ---/' \
     | head -n 6