Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

Commit 3865887

Browse files
committed
Add C++17 tests fpr Windows.
1 parent 26a843d commit 3865887

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

Diff for: setmscver.bat

+6
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@ cl /nologo /EP ver.c > ver_raw.txt
44
findstr /v /r /c:"^$" "ver_raw.txt" > "ver.txt"
55
set /P _MSC_VER=< ver.txt
66
echo set _MSC_VER=%_MSC_VER%
7+
if exist cflags.txt del /q cflags.txt
8+
if exist dflags.txt del /q dflags.txt
9+
if exist add_tests.txt del /q add_tests.txt
10+
if %_MSC_VER% GTR 1900 echo /std:c++17 > cflags.txt
11+
if %_MSC_VER% GTR 1900 echo -extern-std=c++17 > dflags.txt
12+
if %_MSC_VER% GTR 1900 echo string_view > add_tests.txt
713
del ver.c ver_raw.txt

Diff for: test/stdcpp/win64.mak

+15-10
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,34 @@ MODEL=64
55
DRUNTIMELIB=druntime64.lib
66
CC=cl
77

8-
_MSC_VER = $(file < ..\..\ver.txt)
8+
TESTS=array allocator new string vector
99

10-
TESTS= array allocator new string vector
10+
_MSC_VER=$(file < ..\..\ver.txt)
11+
ADD_CFLAGS=$(file < ..\..\cflags.txt)
12+
ADD_DFLAGS=$(file < ..\..\dflags.txt)
13+
ADD_TESTS=$(file < ..\..\add_tests.txt)
14+
15+
TESTS=$(TESTS) $(ADD_TESTS)
1116

1217
test: $(TESTS)
1318

1419
$(TESTS):
15-
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MT
16-
"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmt test\stdcpp\src\$@_test.d $@_cpp.obj
20+
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\$@.cpp /EHsc /MT $(ADD_CFLAGS)
21+
"$(DMD)" -of=$@.exe -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
1722
$@.exe
1823
del $@.exe $@.obj $@_cpp.obj
1924

20-
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\[email protected] /EHsc /MD
21-
"$(DMD)" [email protected] -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrt test\stdcpp\src\$@_test.d $@_cpp.obj
25+
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\[email protected] /EHsc /MD $(ADD_CFLAGS)
26+
"$(DMD)" [email protected] -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrt $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
2227
2328
2429

25-
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\[email protected] /EHsc /MTd
26-
"$(DMD)" [email protected] -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmtd test\stdcpp\src\$@_test.d $@_cpp.obj
30+
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\[email protected] /EHsc /MTd $(ADD_CFLAGS)
31+
"$(DMD)" [email protected] -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=libcmtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
2732
2833
2934

30-
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\[email protected] /EHsc /MDd
31-
"$(DMD)" [email protected] -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrtd test\stdcpp\src\$@_test.d $@_cpp.obj
35+
"$(CC)" -c /Fo$@_cpp.obj test\stdcpp\src\[email protected] /EHsc /MDd $(ADD_CFLAGS)
36+
"$(DMD)" [email protected] -m$(MODEL) -conf= -Isrc -defaultlib=$(DRUNTIMELIB) -main -unittest -version=_MSC_VER_$(_MSC_VER) -mscrtlib=msvcrtd $(ADD_DFLAGS) test\stdcpp\src\$@_test.d $@_cpp.obj
3237
3338

0 commit comments

Comments
 (0)