Match "32mscoff" to "32" in conditional TEST_OUTPUT

MoonlightSentinel · MoonlightSentinel · commit 684e1f7f1530 · 2020-02-19T22:51:16.000+01:00
Conditional output for 32 bit compilation seldomly depends on the object format
diff --git a/test/tools/d_do_test.d b/test/tools/d_do_test.d
@@ -638,7 +638,7 @@ bool compareOutput(string output, string refoutput, const ref EnvData envData)
                 break;
             }
             // Match against OS or model
-            else if (conditional[0].among(envData.os, envData.model))
+            else if (conditional[0].among(envData.os, envData.model, envData.model[0 .. min(2, $)]))
             {
                 toSkip = conditional[2];
                 break;
@@ -684,6 +684,9 @@ unittest
 
     const emptyFmt = "On <$?:windows=abc|$> use <$?:posix=$>!";
     assert(compareOutput("On <> use <>!", emptyFmt, ed));
+
+    ed.model = "32mscoff";
+    assert(compareOutput("size_t is uint!", "size_t is $?:32=uint|64=ulong$!", ed));
 }
 
 string envGetRequired(in char[] name)

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ bool compareOutput(string output, string refoutput, const ref EnvData envData)`
`638`	`638`	`break;`
`639`	`639`	`}`
`640`	`640`	`// Match against OS or model`
`641`		`- else if (conditional[0].among(envData.os, envData.model))`
	`641`	`+ else if (conditional[0].among(envData.os, envData.model, envData.model[0 .. min(2, $)]))`
`642`	`642`	`{`
`643`	`643`	`toSkip = conditional[2];`
`644`	`644`	`break;`
`@@ -684,6 +684,9 @@ unittest`
`684`	`684`
`685`	`685`	`const emptyFmt = "On <$?:windows=abc\|$> use <$?:posix=$>!";`
`686`	`686`	`assert(compareOutput("On <> use <>!", emptyFmt, ed));`
	`687`	`+`
	`688`	`+ ed.model = "32mscoff";`
	`689`	`+ assert(compareOutput("size_t is uint!", "size_t is $?:32=uint\|64=ulong$!", ed));`
`687`	`690`	`}`
`688`	`691`
`689`	`692`	`string envGetRequired(in char[] name)`