From 3995196072d96d7b01e1f42cdf47e2399546e84a Mon Sep 17 00:00:00 2001 From: James Holderness Date: Thu, 3 Dec 2020 18:38:18 +0000 Subject: [PATCH] Correct paths in the the runut and runft test scripts (#8488) This corrects the path to `Terminal.Core.Unit.Tests.dll` in the `runut` unit test script and makes the `runft` feature test script capable of working with _Release_ builds as well as _Debug_ builds. The path to `Terminal.Core.Unit.Tests.dll` changed when the project was restructured, and the `runut` script was never updated to reflect that change. That has now been corrected. And the `runft` script used to be hard coded to look for tests in the _Debug_ directory, but it has now been updated to use the `%_LAST_BUILD_CONF%` environment variable, so it should work for both _Debug_ and _Release_ builds. ## Validation Steps Performed I've manually confirmed that the `runut` and `runft` scripts now work as expected. Closes #8485 --- tools/runft.cmd | 2 +- tools/runut.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/runft.cmd b/tools/runft.cmd index f2632c886..870e48ed3 100644 --- a/tools/runft.cmd +++ b/tools/runft.cmd @@ -4,5 +4,5 @@ rem Run the console feature tests. rem Keep this file in sync with tests.xml call %TAEF% ^ - %OPENCON%\bin\%ARCH%\Debug\ConHost.Feature.Tests.dll ^ + %OPENCON%\bin\%ARCH%\%_LAST_BUILD_CONF%\ConHost.Feature.Tests.dll ^ %* diff --git a/tools/runut.cmd b/tools/runut.cmd index fd3c7084f..35d81dbdd 100644 --- a/tools/runut.cmd +++ b/tools/runut.cmd @@ -16,7 +16,7 @@ if "%PLATFORM%" == "Win32" ( call %TAEF% ^ %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Conhost.Unit.Tests.dll ^ %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\TextBuffer.Unit.Tests.dll ^ - %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Terminal.Core.Unit.Tests.dll ^ + %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\UnitTests_TerminalCore\Terminal.Core.Unit.Tests.dll ^ %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\Conhost.Interactivity.Win32.Unit.Tests.dll ^ %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\ConParser.Unit.Tests.dll ^ %OPENCON%\bin\%PLATFORM%\%_LAST_BUILD_CONF%\ConAdapter.Unit.Tests.dll ^