Druntime test merge fix #4883

the-horo · 2025-03-17T19:16:03Z

Fix the druntime tests merge conflicts as well as resolve some issues with the test code. Some changes are specific to LDC and should remain here, some are bugs that should be fixed upstream but currently they're all in separate commits and will be split and squashed later.

kinke · 2025-03-17T19:19:40Z

.github/actions/1-setup/action.yml

+      run: |
+        brew install make
+        echo "PATH=/usr/local/opt/make/libexec/gnubin:$PATH" >> $GITHUB_ENV
+        make --version


Won't work on the M1 runners (at least last time I checked): https://github.com/dlang/dmd/pull/17035/files#r1997643588

I was sure that that PATH was going to break eventually. I suppose we don't need the PATH modifications since we're checking for gmake first in

ldc/runtime/DRuntimeIntegrationTests.cmake

Line 4 in dddcd98

find_program(GNU_MAKE_BIN NAMES gmake gnumake make)

Right, the macOS arm64 job seems happy as-is, so we can remove it. 👍

kinke · 2025-03-17T19:21:36Z

runtime/druntime/test/common.mak

@@ -1,5 +1,5 @@
 # set explicitly in the make cmdline in druntime/Makefile (`test/%/.run` rule):
-ifneq (,$(findstring ldmd2,$(DMD)))
+ifdef IN_LDC


Mm, much better, I like! 👍

kinke · 2025-03-18T00:04:41Z

runtime/DRuntimeIntegrationTests.cmake

@@ -82,12 +76,9 @@ foreach(name ${testnames})
                ROOT=${outdir} DMD=${LDMD_EXE_FULL} BUILD=${build} SHARED=1
                CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
                DRUNTIME=${druntime_path_build} DRUNTIMESO=${shared_druntime_path_build}
-                CFLAGS_BASE=${cflags_base} DFLAGS_BASE=${dflags_base} ${linkdl}
+                CFLAGS=${cflags_base} CXXFLAGS=${cflags_base} DFLAGS=${dflags_base} ${linkdl}


I wonder if we can really override DFLAGS with the (optional) base flags - don't we lose the implicit [-g -debug | -O -release] -w as default DFLAGS this way?

Edit: Oh well, and the same for CFLAGS and CXXFLAGS.

This is intended behavior. If one of those flags (notably -g) is required by the tests then that should be specified in the makefile, outside of DFLAGS. If we want to test multiple configurations (like LINK_SHARED=1 or DFLAGS=-m32 or even DFLAGS="-O -release") then these flags should be specified explicitly.

If we want to keep testing both sets of flags we could reintroduce the DFLAGS_BASE variables to preserve the defaults from the makefile or we could pass D_EXTRA_FLAGS in DMD which would be appropriate if that cmake variable is meant for -m32 or -mtriple like arguments.

We can also start passing LDFLAGS=${LD_FLAGS} but, if those flags are only meant for C sources, we would also need LDFLAGS.d="" since common.mak autofills the latter based on the former. There's also d_platform_libs which is used by stdcpp, maybe we could set that to C_SYSTEM_LIBS?

kinke · 2025-03-18T00:09:10Z

runtime/druntime/test/common.mak

@@ -186,9 +157,17 @@ extra_ldlibs.d += -L$(druntime_for_linking)

 extra_ldflags.d += -defaultlib=
 extra_ldlibs.d += $(d_platform_libs)
+else # IN_LDC
+    extra_ldflags.d += -defaultlib=druntime-ldc
+    extra_ldflags.d += $(if $(LINK_SHARED),-link-defaultlib-shared)


-link-defaultlib-shared isn't a pure link-only flag, but also affects some compile flag defaults for Windows target (e.g., defaulting to -dllimport=defaultLibsOnly when not using -fvisibility...). So needs to be specified when compiling too (extra_dflags).

The dmd branch adds -dllimport to ldflags, should that be changed as well?

kinke · 2025-03-18T00:15:27Z

runtime/druntime/test/gc/invariant.d

@@ -0,0 +1,3 @@
+// ldc fails to link a file named invariant.d
+// https://github.com/ldc-developers/ldc/issues/4879
+module ldc_rename_me;


This was fixed upstream and already landed in merge-2.111.

[Note that you don't need to rebase unless there are merge conflicts; each push to your branch triggers a new GHA workflow for a freshly merged head against the target branch. Dummy-amending the last commit (without any changes) and force-pushing is a way to re-trigger CI against the latest target branch.]

I usually chose to rebase since I have do it eventually and it doesn't take me that long to drop a commit.

runtime/druntime/test/profile/Makefile

kinke · 2025-03-18T00:23:48Z

runtime/druntime/test/shared/Makefile

    # LDC: required for executables to implicitly dllimport DLL data symbols
-    DFLAGS+=-dllimport=all
+    extra_ldflags.d += -dllimport=all


This is pure compile flag only, doesn't affect linking at all.

Btw for DMD this is done in common.mak:153. I guess it doesn't matter where it's defined, this shared/Makefile is IIRC the only one setting LINK_SHARED.

If you remember I do want to also start testing with the shared druntime when building both static&dynamic runtime libs so I want to support that flag being passed on the CLI so I'd rather have the logic for it in common.mak

kinke · 2025-03-18T00:28:57Z

runtime/druntime/test/shared/Makefile

-$(ROOT)/dllgc$(DOTEXE): $(SRC)/dllgc.d
-	$(QUIET)$(DMD) $(DFLAGS) -version=DLL -shared -of$(ROOT)/dllgc$(DOTDLL) $<
-	$(QUIET)$(DMD) $(DFLAGS) -of$@ $<
+$(ROOT)/dllgc$(DOTEXE): private extra_ldflags.d += -link-defaultlib-shared=false -dllimport=none


required for compilation too, not just linking

kinke · 2025-03-18T00:31:50Z

runtime/druntime/test/shared/Makefile

-endif
+$(OBJDIR)/dll_gc_proxy_teardown%$(DOTDLL): private extra_ldflags.d += -L/EXPORT:gc_setProxy -L/EXPORT:gc_clrProxy
+$(OBJDIR)/dll_gc_proxy_teardown%$(DOTDLL): private extra_dflags += -version=DLL
+$(OBJDIR)/dll_gc_proxy_teardown%$(DOTEXE): private extra_ldflags.d += -link-defaultlib-shared=false -dllimport=none


dflags/ldflags need tweaking again

kinke · 2025-03-18T00:51:05Z

It might be worth reconsidering splitting the D flags into compile- and link-flags - there's no harm in including link-flags in compiles too, just a bit longer/more explicit command lines in the make output (normally hidden).

the-horo · 2025-03-18T06:57:14Z

It might be worth reconsidering splitting the D flags into compile- and link-flags - there's no harm in including link-flags in compiles too, just a bit longer/more explicit command lines in the make output (normally hidden).

DFLAGS and extra_dflags do apply to both compilation and linking, on top of most of the tests doing compilation+linking in one compiler invocation (stdcpp is the only one that does manual compilation because of the need to link the C++ stdlib).

I would rather not change this design because I purposefully made it follow the way other build systems do it, and if they do it this way I assume that there is a reason for it. So, until I fully understand this reason I would rather go with the possibly sub-optimal design.

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

the-horo mentioned this pull request Mar 17, 2025

[WIP] Upgrade frontend & libs to v2.111 #4877

Draft

kinke reviewed Mar 17, 2025

View reviewed changes

kinke reviewed Mar 18, 2025

View reviewed changes

runtime/druntime/test/profile/Makefile Show resolved Hide resolved

kinke reviewed Mar 18, 2025

View reviewed changes

runtime/druntime/test: Fix

4a14277

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

the-horo force-pushed the pr-2.111 branch from dddcd98 to 1f5a162 Compare March 18, 2025 07:53

the-horo added 8 commits March 18, 2025 10:03

CI: macOS install a more recent GNU make

3e58b7f

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

druntime-tests: Specify trailing slash to /Fo argument

f96467e

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

druntime-tests/stdcpp/posix: Add drutnime -rpath when linking cpp files

85d2403

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

druntime-tests/shared: Pass -rpath on non-windows

163f81e

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

druntime-tests/stdcpp/windows: Don't override TARGET_ARCH

de70287

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

DRuntimeIntegrationTests.cmake: Don't pass -rpath

8c9ee02

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

DRuntimeIntegrationTests.cmake: Also pass CXXFLAGS

821f308

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

[dmd] druntime-tests: Pass -dllimport in dflags instead of ldflags

d2ca7c6

Signed-off-by: Andrei Horodniceanu <a.horodniceanu@proton.me>

the-horo force-pushed the pr-2.111 branch from 1f5a162 to d2ca7c6 Compare March 18, 2025 08:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Druntime test merge fix #4883

Druntime test merge fix #4883

the-horo commented Mar 17, 2025

kinke Mar 17, 2025

the-horo Mar 17, 2025

kinke Mar 17, 2025

kinke Mar 17, 2025

kinke Mar 18, 2025 •

edited

Loading

the-horo Mar 18, 2025

the-horo Mar 18, 2025

kinke Mar 18, 2025

the-horo Mar 18, 2025

kinke Mar 18, 2025

the-horo Mar 18, 2025

kinke Mar 18, 2025

kinke Mar 18, 2025

the-horo Mar 18, 2025

kinke Mar 18, 2025

kinke Mar 18, 2025

kinke commented Mar 18, 2025

the-horo commented Mar 18, 2025

Druntime test merge fix #4883

Are you sure you want to change the base?

Druntime test merge fix #4883

Conversation

the-horo commented Mar 17, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kinke Mar 18, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kinke commented Mar 18, 2025

the-horo commented Mar 18, 2025

kinke Mar 18, 2025 •

edited

Loading