One more try?

dlang · Jul 29, 2019 · 782fdbf · 782fdbf
1 parent 4ac352f
commit 782fdbf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -59,7 +59,6 @@ build_script:
   - cd c:\projects\dmd\src
   - msbuild vcbuild\dmd.sln /m /p:Configuration=Release;Platform=x64
   - cd c:\projects\druntime
-  - setmscver.bat
   - make -f win64.mak DMD=../dmd/generated/Windows/Release/x64/dmd CC=cl auto-tester-build auto-tester-test
 
 test_script: true
diff --git a/setmscver.bat b/setmscver.bat
@@ -1,7 +1,7 @@
 @echo off
 echo _MSC_VER > ver.c
-cl /nologo /EP ver.c > ver.txt
-findstr /v /r /c:"^$" "ver.txt" > "ver_trim.txt"
-set /P _MSC_VER=< ver_trim.txt
+cl /nologo /EP ver.c > ver_raw.txt
+findstr /v /r /c:"^$" "ver_raw.txt" > "ver.txt"
+set /P _MSC_VER=< ver.txt
 echo set _MSC_VER=%_MSC_VER%
-del ver.c ver.txt ver_trim.txt
+del ver.c ver_raw.txt
diff --git a/test/stdcpp/win64.mak b/test/stdcpp/win64.mak
@@ -5,6 +5,8 @@ MODEL=64
 DRUNTIMELIB=druntime64.lib
 CC=cl
 
+_MSC_VER = $(file < ..\..\ver.txt)
+
 TESTS= array allocator new string
 
 test: $(TESTS)

diff --git a/win64.mak b/win64.mak
@@ -109,7 +109,7 @@ test_hash:
 
 test_stdcpp:
 	setmscver.bat
-	"$(MAKE)" -f test\stdcpp\win64.mak "DMD=$(DMD)" MODEL=$(MODEL) "VCDIR=$(VCDIR)" DRUNTIMELIB=$(DRUNTIME) "CC=$(CC)" "_MSC_VER=$(_MSC_VER)" test
+	"$(MAKE)" -f test\stdcpp\win64.mak "DMD=$(DMD)" MODEL=$(MODEL) "VCDIR=$(VCDIR)" DRUNTIMELIB=$(DRUNTIME) "CC=$(CC)" test
 
 test_gc:
 	"$(MAKE)" -f test\gc\win64.mak "DMD=$(DMD)" MODEL=$(MODEL) "VCDIR=$(VCDIR)" DRUNTIMELIB=$(DRUNTIME) "CC=$(CC)" test