GHA Alpine: include shared druntime+Phobos too

Author: kinke

.github/actions/6-integration-test/action.yml

@@ -15,9 +15,6 @@ runs:
       run: |
         set -eux
         cd ..
-        if type -P apk &>/dev/null; then
-          exit 0 # Alpine: no shared libs
-        fi
         if [[ '${{ runner.os }}' == Windows ]]; then
           # add druntime/Phobos DLL dir to PATH
           export PATH="$PWD/installed/bin:$PATH"

.github/workflows/main.yml

@@ -61,7 +61,6 @@ jobs:
             # TSan and XRay do not work.
             extra_cmake_flags: >-
               -DBUILD_LTO_LIBS=ON
-              -DBUILD_SHARED_LIBS=OFF
               -DLLVM_IS_SHARED=OFF
               -DLDC_ENABLE_PLUGINS=OFF
               -DLDC_DYNAMIC_COMPILE=OFF

runtime/druntime/test/shared/Makefile

@@ -4,7 +4,7 @@ LINK_SHARED:=$(SHARED)
 include ../common.mak # affected by LINK_SHARED!
 
 ifneq (,$(LINK_SHARED))
-    # LDC: disable 3 tests on Mac, 1 on Windows
+    # LDC: disable 2 tests on Mac, 1 on Windows
     ifeq (,$(findstring ldmd2,$(DMD)))
         # TODO: enable tests on Windows
         ifeq (windows,$(OS))
@@ -14,20 +14,18 @@ ifneq (,$(LINK_SHARED))
                    link_linkdep load_linkdep link_loaddep load_loaddep load_13414
         endif
     else
-        TESTS:=link load linkD linkDR loadDR dynamiccast \
+        TESTS:=link load linkD linkDR loadDR finalize dynamiccast \
                link_linkdep link_loaddep load_loaddep load_13414
         ifneq ($(OS),osx)
             # * `host` loads two modules with the same name, which is currently disallowed
             #   by the (potentially overly eager) module collision detection on OS X.
-            # * `finalize` fails starting with macOS 10.13, as .dylibs with TLS can't be
-            #   unloaded anymore (https://github.com/ldc-developers/ldc/issues/3002).
             # * FIXME: `load_linkdep`
             #   it might fail because of unimplemented `getDependencies()` in rt.sections_elf_shared
             ifeq (windows,$(OS))
                 # LDC FIXME: disable `load_linkdep` on Windows - needs `getDependencies()`
-                TESTS+=host finalize
+                TESTS+=host
             else
-                TESTS+=host finalize load_linkdep
+                TESTS+=host load_linkdep
             endif
         endif
     endif

runtime/druntime/test/shared/src/finalize.d

@@ -45,7 +45,7 @@ void main(string[] args)
     auto nf1 = new NoFinalize;
     auto nf2 = new NoFinalizeBig;
 
-    shared size_t finalizeCounter;
+    shared static size_t finalizeCounter;
     SetFinalizeCounter setFinalizeCounter;
     loadSym(h, setFinalizeCounter, "setFinalizeCounter");
     setFinalizeCounter(&finalizeCounter);
@@ -58,8 +58,20 @@ void main(string[] args)
     auto r = Runtime.unloadLibrary(h);
     if (!r)
         assert(0);
-    if (finalizeCounter != 4)
-        assert(0);
+    version (darwin)
+    {
+        // Fails starting with macOS 10.13, as .dylibs with TLS can't be
+        // unloaded anymore (https://github.com/ldc-developers/ldc/issues/3002).
+    }
+    else version (CRuntime_Musl)
+    {
+        // On Musl, dlclose is a no-op
+    }
+    else
+    {
+        if (finalizeCounter != 4)
+            assert(0);
+    }
     if (nf1._finalizeCounter)
         assert(0);
     if (nf2._finalizeCounter)

runtime/druntime/test/shared/src/load_13414.d

@@ -22,25 +22,20 @@ void runTest(string name)
     *pLibSharedStaticDtorHook = &sharedStaticDtorHook;
 
     const unloaded = Runtime.unloadLibrary(h);
-    version (CRuntime_Musl)
+    assert(unloaded);
+    assert(tlsDtor == 1);
+    version (LDC_darwin)
     {
-        // On Musl, unloadLibrary is a no-op because dlclose is a no-op
-        assert(!unloaded);
-        assert(tlsDtor == 0);
+        // Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
         assert(dtor == 0);
     }
-    else
+    else version (CRuntime_Musl)
     {
-        assert(unloaded);
-        assert(tlsDtor == 1);
-        version (LDC_darwin)
-        {
-            // Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
-            assert(dtor == 0);
-        }
-        else
-            assert(dtor == 1);
+        // On Musl, dlclose is a no-op
+        assert(dtor == 0);
     }
+    else
+        assert(dtor == 1);
 }
 
 void main(string[] args)