From 5657c28b8bc6771aee74058703df6d31958b854d Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 7 Aug 2014 14:59:00 -0700 Subject: [PATCH] Fix the incorrect declaration file path during d.ts file compile in the compilerrunner --- src/harness/compilerRunner.ts | 2 +- .../baselines/reference/multiImportExport.js | 27 ------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 29100bedf3f..151efd0ef1b 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -246,7 +246,7 @@ class CompilerBaselineRunner extends RunnerBase { var declFile = ts.forEach(result.declFilesCode, declFile => declFile.fileName === (file.unitName.substr(0, file.unitName.length - ".ts".length) + ".d.ts") ? declFile : undefined); - return { unitName: rootDir + Harness.Path.getFileName(declFile.fileName), content: declFile.code }; + return { unitName: declFile.fileName, content: declFile.code }; } } diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js index 1d28d228704..06d81f7e984 100644 --- a/tests/baselines/reference/multiImportExport.js +++ b/tests/baselines/reference/multiImportExport.js @@ -61,30 +61,3 @@ export = Math; //// [Drawing.d.ts] export import Math = require('Math/Math'); //// [consumer.d.ts] - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/consumer.d.ts (0 errors) ==== - -==== tests/cases/compiler/Drawing.d.ts (1 errors) ==== - export import Math = require('Math/Math'); - ~~~~~~~~~~~ -!!! Cannot find external module 'Math/Math'. - -==== tests/cases/compiler/Math.d.ts (1 errors) ==== - import Adder = require('Math/Adder'); - ~~~~~~~~~~~~ -!!! Cannot find external module 'Math/Adder'. - declare var Math: { - Adder: typeof Adder; - }; - export = Math; - -==== tests/cases/compiler/Adder.d.ts (0 errors) ==== - declare class Adder { - add(a: number, b: number): void; - } - export = Adder; - \ No newline at end of file