[try re-enabling some tests]

dlang · Jan 21, 2025 · 5a36f31 · 5a36f31
1 parent 1d1b034
commit 5a36f31
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ci/run.sh b/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

diff --git a/druntime/test/exceptions/Makefile b/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