mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-29 14:40:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

druntime/test/*.mak: replaces -Isrc by -Iimport (#15881)

Browse source 
* druntime/test/*.mak: Replace -Isrc by -Iimport

* Fix Windows tests build: rt/tlsgc.d is not in import/ dir

---------

Co-authored-by: Denis Feklushkin <feklushkin.denis@gmail.com>
This commit is contained in:
Denis Feklushkin 2023-12-04 17:24:07 +07:00 • committed by GitHub
parent 2bbf64907c
commit 554f822d4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
druntime/test/allocations/win64.mak
View file

@ -7,6 +7,6 @@ DRUNTIMELIB=druntime64.lib
test: alloc_from_assert test: alloc_from_assert
alloc_from_assert: alloc_from_assert:
$(DMD) -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) test\allocations\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) test\allocations\src\$@.d
$@.exe $@.exe
del $@.* del $@.*

20
druntime/test/betterc/win64.mak
View file

@ -8,43 +8,43 @@ TESTS=test18828 test19416 test19421 test19561 test20088 test20613 test19924 test
test: $(TESTS) test: $(TESTS)
test18828: test18828:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test19416: test19416:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test19421: test19421:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test19561: test19561:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test20088: test20088:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test20613: test20613:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test19924: test19924:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test22336: test22336:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test19933: test19933:
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -run test\betterc\src\$@.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -run test\betterc\src\$@.d
del $@.* del $@.*
test19933_mingw: test19933_mingw:
# DFLAGS=-mscrtlib=msvcrt120 takes precedence over any command line flags, so # DFLAGS=-mscrtlib=msvcrt120 takes precedence over any command line flags, so
# specify vcruntime140.lib explicitly for using mingw with Universal CRT # specify vcruntime140.lib explicitly for using mingw with Universal CRT
$(DMD) -m$(MODEL) -conf= -Isrc -betterC -Lvcruntime140.lib -Llegacy_stdio_definitions.lib -L/NODEFAULTLIB:msvcrt120.lib -run test\betterc\src\test19933.d $(DMD) -m$(MODEL) -conf= -Iimport -betterC -Lvcruntime140.lib -Llegacy_stdio_definitions.lib -L/NODEFAULTLIB:msvcrt120.lib -run test\betterc\src\test19933.d
del $@.* del $@.*

2
druntime/test/cpuid/win64.mak
View file

@ -7,6 +7,6 @@ DRUNTIMELIB=druntime64.lib
test: cpuid test: cpuid
cpuid: cpuid:
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) test\cpuid\src\cpuid.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) test\cpuid\src\cpuid.d
cpuid.exe cpuid.exe
del cpuid.exe cpuid.obj del cpuid.exe cpuid.obj

2
druntime/test/exceptions/win64.mak
View file

@ -5,6 +5,6 @@ MODEL=64
DRUNTIMELIB=druntime64.lib DRUNTIMELIB=druntime64.lib
test: test:
$(DMD) -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -g test\exceptions\src\winstack.d $(DMD) -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -g test\exceptions\src\winstack.d
winstack.exe winstack.exe
del winstack.* del winstack.*

2
druntime/test/gc/win64.mak
View file

@ -6,7 +6,7 @@ DRUNTIMELIB=druntime64.lib
SRC_GC = src/core/internal/gc/impl/conservative/gc.d SRC_GC = src/core/internal/gc/impl/conservative/gc.d
SRC = $(SRC_GC) src/rt/lifetime.d src/object.d SRC = $(SRC_GC) src/rt/lifetime.d src/object.d
_DFLAGS = -m$(MODEL) -g -conf= -Isrc -defaultlib=$(DRUNTIMELIB) _DFLAGS = -m$(MODEL) -g -conf= -Iimport -Isrc -defaultlib=$(DRUNTIMELIB)
UDFLAGS = $(_DFLAGS) -unittest -version=CoreUnittest UDFLAGS = $(_DFLAGS) -unittest -version=CoreUnittest
RM = del RM = del

2
druntime/test/init_fini/win64.mak
View file

@ -7,6 +7,6 @@ DRUNTIMELIB=druntime64.lib
test: custom_gc test: custom_gc
custom_gc: custom_gc:
$(DMD) -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) test\init_fini\src\custom_gc.d $(DMD) -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) test\init_fini\src\custom_gc.d
custom_gc.exe custom_gc.exe
del custom_gc.exe custom_gc.obj del custom_gc.exe custom_gc.obj

12
druntime/test/shared/win64.mak
View file

@ -7,24 +7,24 @@ DRUNTIMELIB=druntime64.lib
test: loadlibwin dllrefcount dllgc dynamiccast test: loadlibwin dllrefcount dllgc dynamiccast
dllrefcount: dllrefcount:
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) test\shared\src\dllrefcount.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) test\shared\src\dllrefcount.d
dllrefcount.exe dllrefcount.exe
del dllrefcount.exe dllrefcount.obj del dllrefcount.exe dllrefcount.obj
loadlibwin: loadlibwin:
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) test\shared\src\loadlibwin.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) test\shared\src\loadlibwin.d
loadlibwin.exe loadlibwin.exe
del loadlibwin.exe loadlibwin.obj del loadlibwin.exe loadlibwin.obj
dllgc: dllgc:
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -version=DLL -shared -ofdllgc.dll test\shared\src\dllgc.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -version=DLL -shared -ofdllgc.dll test\shared\src\dllgc.d
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -ofloaddllgc.exe test\shared\src\dllgc.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -ofloaddllgc.exe test\shared\src\dllgc.d
loaddllgc.exe loaddllgc.exe
del loaddllgc.exe loaddllgc.obj dllgc.dll dllgc.obj del loaddllgc.exe loaddllgc.obj dllgc.dll dllgc.obj
dynamiccast: dynamiccast:
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -version=DLL -shared -ofdynamiccast.dll test\shared\src\dynamiccast.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -version=DLL -shared -ofdynamiccast.dll test\shared\src\dynamiccast.d
$(DMD) -g -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -ofdynamiccast.exe test\shared\src\dynamiccast.d $(DMD) -g -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -ofdynamiccast.exe test\shared\src\dynamiccast.d
dynamiccast.exe dynamiccast.exe
cmd /c "if not exist dynamiccast_endbar exit 1" cmd /c "if not exist dynamiccast_endbar exit 1"
cmd /c "if not exist dynamiccast_endmain exit 1" cmd /c "if not exist dynamiccast_endmain exit 1"

8
druntime/test/stdcpp/win64.mak
View file

@ -18,21 +18,21 @@ test: $(TESTS)
$(TESTS): $(TESTS):
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MT $(ADD_CFLAGS) "$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MT $(ADD_CFLAGS)
"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj "$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
$@.exe $@.exe
del $@.exe $@.obj $@_cpp.obj del $@.exe $@.obj $@_cpp.obj
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MD $(ADD_CFLAGS) "$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MD $(ADD_CFLAGS)
"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj "$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
$@.exe $@.exe
del $@.exe $@.obj $@_cpp.obj del $@.exe $@.obj $@_cpp.obj
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MTd $(ADD_CFLAGS) "$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MTd $(ADD_CFLAGS)
"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj "$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
$@.exe $@.exe
del $@.exe $@.obj $@_cpp.obj del $@.exe $@.obj $@_cpp.obj
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MDd $(ADD_CFLAGS) "$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MDd $(ADD_CFLAGS)
"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj "$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
$@.exe $@.exe
del $@.exe $@.obj $@_cpp.obj del $@.exe $@.obj $@_cpp.obj

2
druntime/test/uuid/win64.mak
View file

@ -5,5 +5,5 @@ MODEL=64
DRUNTIMELIB=druntime64.lib DRUNTIMELIB=druntime64.lib
test: test:
$(DMD) -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) test\uuid\test.d uuid.lib $(DMD) -m$(MODEL) -conf= -Iimport -defaultlib=$(DRUNTIMELIB) test\uuid\test.d uuid.lib
del test.exe test.obj del test.exe test.obj