Merge pull request #2675 from BorisCarvajal/fix-unittest-crash

dlang-bot · web-flow · commit 670d0b51568a · 2019-07-14T13:36:03.000+02:00
Fix issue 20048: Unittest printing fails on Windows when using msvcr100.dll
merged-on-behalf-of: Nicholas Wilson &lt;thewilsonator@users.noreply.github.com&gt;
diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -646,8 +646,8 @@ extern (C) UnitTestResult runModuleUnitTests()
         catch ( Throwable e )
         {
             import core.stdc.stdio;
-            printf("%.*s(%zu): [unittest] %.*s\n",
-                cast(int) e.file.length, e.file.ptr, e.line,
+            printf("%.*s(%llu): [unittest] %.*s\n",
+                cast(int) e.file.length, e.file.ptr, cast(ulong) e.line,
                 cast(int) e.message.length, e.message.ptr);
             if ( typeid(e) == typeid(AssertError) )
             {

Original file line number	Diff line number	Diff line change
`@@ -646,8 +646,8 @@ extern (C) UnitTestResult runModuleUnitTests()`
`646`	`646`	`catch ( Throwable e )`
`647`	`647`	`{`
`648`	`648`	`import core.stdc.stdio;`
`649`		`- printf("%.s(%zu): [unittest] %.s\n",`
`650`		`- cast(int) e.file.length, e.file.ptr, e.line,`
	`649`	`+ printf("%.s(%llu): [unittest] %.s\n",`
	`650`	`+ cast(int) e.file.length, e.file.ptr, cast(ulong) e.line,`
`651`	`651`	`cast(int) e.message.length, e.message.ptr);`
`652`	`652`	`if ( typeid(e) == typeid(AssertError) )`
`653`	`653`	`{`