Skip to content

Commit 243d1b8

Browse files
committed
GHA Alpine: include shared druntime+Phobos too
1 parent 094ab42 commit 243d1b8

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ runs:
1515
run: |
1616
set -eux
1717
cd ..
18-
if type -P apk &>/dev/null; then
19-
exit 0 # Alpine: no shared libs
20-
fi
2118
if [[ '${{ runner.os }}' == Windows ]]; then
2219
# add druntime/Phobos DLL dir to PATH
2320
export PATH="$PWD/installed/bin:$PATH"

.github/workflows/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
# TSan and XRay do not work.
6262
extra_cmake_flags: >-
6363
-DBUILD_LTO_LIBS=ON
64-
-DBUILD_SHARED_LIBS=OFF
6564
-DLLVM_IS_SHARED=OFF
6665
-DLDC_ENABLE_PLUGINS=OFF
6766
-DLDC_DYNAMIC_COMPILE=OFF

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

+5-15
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,15 @@ void runTest(string name)
2222
*pLibSharedStaticDtorHook = &sharedStaticDtorHook;
2323

2424
const unloaded = Runtime.unloadLibrary(h);
25-
version (CRuntime_Musl)
25+
assert(unloaded);
26+
assert(tlsDtor == 1);
27+
version (LDC_darwin)
2628
{
27-
// On Musl, unloadLibrary is a no-op because dlclose is a no-op
28-
assert(!unloaded);
29-
assert(tlsDtor == 0);
29+
// Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
3030
assert(dtor == 0);
3131
}
3232
else
33-
{
34-
assert(unloaded);
35-
assert(tlsDtor == 1);
36-
version (LDC_darwin)
37-
{
38-
// Since 10.13: https://github.com/ldc-developers/ldc/issues/3002
39-
assert(dtor == 0);
40-
}
41-
else
42-
assert(dtor == 1);
43-
}
33+
assert(dtor == 1);
4434
}
4535

4636
void main(string[] args)

0 commit comments

Comments
 (0)