From 136a3ea77d2b8cbe9853e51537e3ea31996216a3 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 20 Sep 2017 09:18:39 -0700 Subject: [PATCH] Handle unixy paths in RWC tests (#18585) --- src/harness/harness.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 7a6c061c6d4..88d32871c68 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -2077,10 +2077,9 @@ namespace Harness { for (let {done, value} = gen.next(); !done; { done, value } = gen.next()) { const [name, content, count] = value as [string, string, number | undefined]; if (count === 0) continue; // Allow error reporter to skip writing files without errors - const relativeFileName = ts.combinePaths(relativeFileBase, name) + extension; + const relativeFileName = relativeFileBase + (ts.startsWith(name, "/") ? "" : "/") + name + extension; const actualFileName = localPath(relativeFileName, opts && opts.Baselinefolder, opts && opts.Subfolder); - const actual = content; - const comparison = compareToBaseline(actual, relativeFileName, opts); + const comparison = compareToBaseline(content, relativeFileName, opts); try { writeComparison(comparison.expected, comparison.actual, relativeFileName, actualFileName); }