From: Zebediah Figura zfigura@codeweavers.com
d3d tests are currently running out of address space in gitlab CI.
There are other ways to fix this than using -Wl,--large-address-aware, but this is the easiest, and I do not see any drawbacks to it.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53217 --- tools/makedep.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/tools/makedep.c b/tools/makedep.c index 8495d93d8c6..6ac55a1c745 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3515,6 +3515,7 @@ static void output_test_module( struct makefile *make, unsigned int arch )
strarray_add( &make->all_targets[arch], testmodule ); strarray_add( &make->clean_files, stripped ); + output( "%s:\n", obj_dir_path( make, testmodule )); output_winegcc_command( make, arch ); output_filenames( make->extradllflags ); @@ -3522,9 +3523,11 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filenames_obj_dir( make, make->res_files[arch] ); if ((debug_file = get_debug_file( make, testmodule, arch ))) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); + output_filename( "-Wl,--large-address-aware" ); output_filenames( all_libs ); output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); + output( "%s:\n", obj_dir_path( make, stripped )); output_winegcc_command( make, arch ); output_filename( "-s" ); @@ -3532,9 +3535,11 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files[arch] ); + output_filename( "-Wl,--large-address-aware" ); output_filenames( all_libs ); output_filename( arch_make_variable( "LDFLAGS", arch )); output( "\n" ); + output( "%s %s:", obj_dir_path( make, testmodule ), obj_dir_path( make, stripped )); output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files[arch] );
Please correct me if I'm wrong, but I think it's safer to use `EXTRADLLFLAGS` for specific modules instead.
Otherwise, could you take a look at the following failures?
--- #### Possible regression in [`ntdll:info` from pipeline #16935](https://gitlab.winehq.org/zfigura/wine/-/jobs/33742#L2259):
``` ntdll:info start dlls/ntdll/tests/info.c info.c:195: Test failed: wrong limit FFFEFFFF info.c:197: Test succeeded inside todo block: wrong limit FFFEFFFF info.c:220: Test marked todo: got wrong status 0 wow64 1 ```
--- #### Possible regression in [`ntdll:wow64` from pipeline #16935](https://gitlab.winehq.org/zfigura/wine/-/jobs/33742#L2413):
``` ntdll:wow64 start dlls/ntdll/tests/wow64.c wow64.c:716: Test marked todo: wrong page size 0 wow64.c:718: Test marked todo: wrong flags 0 wow64.c:720: Test marked todo: wrong machine 0 / 8664 wow64.c:722: Test marked todo: wrong machine 0 wow64.c:734: wow64info found at 78 wow64.c:788: no WOW64INFO section handle wow64.c:945: cs 0023 ss 002b fs 0063 wow64.c:1655: Test marked todo: NtWow64WriteVirtualMemory64 failed 0 wow64.c:1658: Test marked todo: wrong size c wow64.c:1664: Test marked todo: NtWow64AllocateVirtualMemory64 failed 40000002 wow64.c:1691: Test failed: wrong limit FFFEFFFF wow64.c:1693: Test succeeded inside todo block: wrong limit FFFEFFFF ```