[re-enable hacked-out tests]

ci/run.sh

@@ -127,8 +127,6 @@ test_dmd() {
         # FIXME: disable some failing tests on Alpine:
         # * no TLS variables support with gdb: https://gitlab.alpinelinux.org/alpine/aports/-/issues/11154
         rm compiler/test/runnable/gdb4181.d
-        # * some failure wrt. exception stack traces
-        rm compiler/test/runnable/{test19086.d,test17559.d}
     fi
 
     $build_path/dmd -g -i -Icompiler/test -release compiler/test/run.d -ofgenerated/run

druntime/Makefile

@@ -427,11 +427,16 @@ HAS_ADDITIONAL_TESTS:=$(shell test -d test && echo 1)
 ifeq ($(HAS_ADDITIONAL_TESTS),1)
     ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles test/allocations test/typeinfo \
         test/aa test/cpuid test/gc test/hash test/lifetime test/shared \
-        test/thread test/unittest test/imports test/betterc test/stdcpp test/config test/traits #test/importc_compare
+        test/thread test/unittest test/imports test/betterc test/stdcpp test/config test/traits
     ifeq (windows,$(OS))
-        ADDITIONAL_TESTS+=test/uuid
+        ADDITIONAL_TESTS+=test/uuid test/importc_compare
     else
         ADDITIONAL_TESTS+=test/valgrind
+        # FIXME: importc_compare fails on Alpine v3.21 with conflicting struct declarations in the C headers:
+        # /usr/include/asm-generic/fcntl.h(195): Error: struct `importc_includes.flock` conflicts with struct `importc_includes.flock` at /usr/include/fcntl.h(24)
+        ifneq (1,$(shell which apk &>/dev/null && echo 1))
+            ADDITIONAL_TESTS+=test/importc_compare
+        endif
     endif
 endif
 

druntime/test/exceptions/Makefile

@@ -1,7 +1,19 @@
+ifeq ($(OS),linux)
+    # Alpine Linux comes with an apk tool
+    ifeq (1,$(shell which apk &>/dev/null && echo 1))
+        IS_MUSL:=1
+    endif
+endif
+
 TESTS=stderr_msg unittest_assert invalid_memory_operation static_dtor \
       future_message refcounted rt_trap_exceptions_drt catch_in_finally \
       message_with_null
 
+# FIXME: segfaults with musl libc
+ifneq ($(IS_MUSL),1)
+TESTS += unknown_gc
+endif
+
 # fails on 32 bit linux
 ifneq ($(OS),linux)
 TESTS += assert_fail
@@ -12,9 +24,9 @@ SED:=sed
 GDB:=gdb
 
 ifeq ($(OS),linux)
-    #TESTS+=line_trace line_trace_21656 long_backtrace_trunc rt_trap_exceptions cpp_demangle
-# registerMemoryAssertHandler requires glibc; disable the tests on Alpine (apk tool available)
-    ifneq (1,$(shell which apk > /dev/null 2>&1 && echo 1))
+    TESTS+=line_trace line_trace_21656 long_backtrace_trunc rt_trap_exceptions cpp_demangle
+    # registerMemoryAssertHandler requires glibc
+    ifneq ($(IS_MUSL),1)
         TESTS+=memoryerror_null_read memoryerror_null_write memoryerror_null_call memoryerror_stackoverflow
     endif
     line_trace_dflags:=-L--export-dynamic