From 3e5bb994781810b41858aa169a3f78421f1c02be Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett (MSFT)" Date: Wed, 10 Jul 2019 12:40:51 -0700 Subject: [PATCH] inbox: reflect incoming changes up to uxp aa5182a2 (#1916) --- src/host/ft_host/API_AliasTests.cpp | 6 ------ src/host/ft_host/API_BufferTests.cpp | 5 ----- src/host/ft_host/API_CursorTests.cpp | 7 ------- src/host/ft_host/API_DimensionsTests.cpp | 6 ------ src/host/ft_host/API_FileTests.cpp | 6 ------ src/host/ft_host/API_FillOutputTests.cpp | 5 ----- src/host/ft_host/API_FontTests.cpp | 6 ------ src/host/ft_host/API_InputTests.cpp | 7 ------- src/host/ft_host/API_ModeTests.cpp | 4 ---- src/host/ft_host/API_OutputTests.cpp | 6 ------ src/host/ft_host/API_PolicyTests.cpp | 6 ------ src/host/ft_host/API_RgbColorTests.cpp | 6 ------ src/host/ft_host/API_TitleTests.cpp | 6 ------ src/host/ft_host/CJK_DbcsTests.cpp | 7 ------- src/host/ft_host/CanaryTests.cpp | 5 ----- src/host/ft_host/InitTests.cpp | 17 +++++++++++++++++ src/host/ft_host/Message_KeyPressTests.cpp | 5 ----- src/host/ft_host/testmd.definition | 2 +- src/host/ut_host/testmd.definition | 2 +- 19 files changed, 19 insertions(+), 95 deletions(-) diff --git a/src/host/ft_host/API_AliasTests.cpp b/src/host/ft_host/API_AliasTests.cpp index 833159e7d..ec274528a 100644 --- a/src/host/ft_host/API_AliasTests.cpp +++ b/src/host/ft_host/API_AliasTests.cpp @@ -35,12 +35,6 @@ using WEX::Logging::Log; class AliasTests { BEGIN_TEST_CLASS(AliasTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl3.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"api-ms-win-core-console-l3-2-0.lib") END_TEST_CLASS() BEGIN_TEST_METHOD(TestGetConsoleAlias) diff --git a/src/host/ft_host/API_BufferTests.cpp b/src/host/ft_host/API_BufferTests.cpp index 706dda1e0..b583dbdb1 100644 --- a/src/host/ft_host/API_BufferTests.cpp +++ b/src/host/ft_host/API_BufferTests.cpp @@ -14,11 +14,6 @@ class BufferTests { BEGIN_TEST_CLASS(BufferTests) TEST_CLASS_PROPERTY(L"IsolationLevel", L"Method") - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS() TEST_METHOD(TestSetConsoleActiveScreenBufferInvalid); diff --git a/src/host/ft_host/API_CursorTests.cpp b/src/host/ft_host/API_CursorTests.cpp index 96446cb9c..1e90b57c6 100644 --- a/src/host/ft_host/API_CursorTests.cpp +++ b/src/host/ft_host/API_CursorTests.cpp @@ -10,13 +10,6 @@ class CursorTests { BEGIN_TEST_CLASS(CursorTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl3.h") END_TEST_CLASS() TEST_METHOD_SETUP(TestSetup); diff --git a/src/host/ft_host/API_DimensionsTests.cpp b/src/host/ft_host/API_DimensionsTests.cpp index 357eb2dcb..2216ab315 100644 --- a/src/host/ft_host/API_DimensionsTests.cpp +++ b/src/host/ft_host/API_DimensionsTests.cpp @@ -17,12 +17,6 @@ using namespace WEX::Common; class DimensionsTests { BEGIN_TEST_CLASS(DimensionsTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS() TEST_METHOD_SETUP(TestSetup); diff --git a/src/host/ft_host/API_FileTests.cpp b/src/host/ft_host/API_FileTests.cpp index 18da6911d..138ecd3ea 100644 --- a/src/host/ft_host/API_FileTests.cpp +++ b/src/host/ft_host/API_FileTests.cpp @@ -21,12 +21,6 @@ class FileTests // the buffer and cursor position for each test. Launching a new OpenConsole is much quicker. BEGIN_TEST_CLASS(FileTests) TEST_CLASS_PROPERTY(L"IsolationLevel", L"Method") - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS(); TEST_METHOD(TestUtf8WriteFileInvalid); diff --git a/src/host/ft_host/API_FillOutputTests.cpp b/src/host/ft_host/API_FillOutputTests.cpp index 680f24eb3..6505dfc74 100644 --- a/src/host/ft_host/API_FillOutputTests.cpp +++ b/src/host/ft_host/API_FillOutputTests.cpp @@ -8,11 +8,6 @@ class FillOutputTests { BEGIN_TEST_CLASS(FillOutputTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS() TEST_METHOD(WriteNarrowGlyphAscii) diff --git a/src/host/ft_host/API_FontTests.cpp b/src/host/ft_host/API_FontTests.cpp index 254e3a849..5d48e1e02 100644 --- a/src/host/ft_host/API_FontTests.cpp +++ b/src/host/ft_host/API_FontTests.cpp @@ -14,12 +14,6 @@ static const PCWSTR pwszLongFontPath = L"%WINDIR%\\Fonts\\ltype.ttf"; class FontTests { BEGIN_TEST_CLASS(FontTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl3.h") END_TEST_CLASS() TEST_METHOD_SETUP(TestSetup); diff --git a/src/host/ft_host/API_InputTests.cpp b/src/host/ft_host/API_InputTests.cpp index 0a146a821..cf11cd44d 100644 --- a/src/host/ft_host/API_InputTests.cpp +++ b/src/host/ft_host/API_InputTests.cpp @@ -24,13 +24,6 @@ using namespace WEX::Common; class InputTests { BEGIN_TEST_CLASS(InputTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"api-ms-win-core-console-l2-2-0.lib") END_TEST_CLASS() TEST_CLASS_SETUP(TestSetup); diff --git a/src/host/ft_host/API_ModeTests.cpp b/src/host/ft_host/API_ModeTests.cpp index 2f7110926..96d0eea34 100644 --- a/src/host/ft_host/API_ModeTests.cpp +++ b/src/host/ft_host/API_ModeTests.cpp @@ -11,10 +11,6 @@ using namespace WEX::Logging; class ModeTests { BEGIN_TEST_CLASS(ModeTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") END_TEST_CLASS() TEST_METHOD_SETUP(TestSetup); diff --git a/src/host/ft_host/API_OutputTests.cpp b/src/host/ft_host/API_OutputTests.cpp index 803932ef5..ebdb383be 100644 --- a/src/host/ft_host/API_OutputTests.cpp +++ b/src/host/ft_host/API_OutputTests.cpp @@ -18,12 +18,6 @@ class OutputTests { BEGIN_TEST_CLASS(OutputTests) TEST_CLASS_PROPERTY(L"IsolationLevel", L"Method") - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS() TEST_CLASS_SETUP(TestSetup); diff --git a/src/host/ft_host/API_PolicyTests.cpp b/src/host/ft_host/API_PolicyTests.cpp index e2c18c74e..c70e02fd4 100644 --- a/src/host/ft_host/API_PolicyTests.cpp +++ b/src/host/ft_host/API_PolicyTests.cpp @@ -9,12 +9,6 @@ using WEX::Logging::Log; class PolicyTests { BEGIN_TEST_CLASS(PolicyTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS() // UAP test type doesn't work quite right in VSO, skip. We'll get it in the RI-TP internally. diff --git a/src/host/ft_host/API_RgbColorTests.cpp b/src/host/ft_host/API_RgbColorTests.cpp index 12f40312e..864497456 100644 --- a/src/host/ft_host/API_RgbColorTests.cpp +++ b/src/host/ft_host/API_RgbColorTests.cpp @@ -20,12 +20,6 @@ const int VT_256_GRID_MODE = 4; class RgbColorTests { BEGIN_TEST_CLASS(RgbColorTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") END_TEST_CLASS() TEST_METHOD_SETUP(MethodSetup) diff --git a/src/host/ft_host/API_TitleTests.cpp b/src/host/ft_host/API_TitleTests.cpp index 6dda4fc64..5d5673dd8 100644 --- a/src/host/ft_host/API_TitleTests.cpp +++ b/src/host/ft_host/API_TitleTests.cpp @@ -11,12 +11,6 @@ using namespace WEX::Common; class TitleTests { BEGIN_TEST_CLASS(TitleTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"api-ms-win-core-console-ansi-l2-1-0.lib") END_TEST_CLASS() TEST_METHOD_SETUP(TestSetup); diff --git a/src/host/ft_host/CJK_DbcsTests.cpp b/src/host/ft_host/CJK_DbcsTests.cpp index b82514ab9..eb55b7a3c 100644 --- a/src/host/ft_host/CJK_DbcsTests.cpp +++ b/src/host/ft_host/CJK_DbcsTests.cpp @@ -228,13 +228,6 @@ class DbcsTests { BEGIN_TEST_CLASS(DbcsTests) TEST_CLASS_PROPERTY(L"IsolationLevel", L"Class") - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl2.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"api-ms-win-core-console-l1-2-1.lib") END_TEST_CLASS(); TEST_METHOD_SETUP(DbcsTestSetup); diff --git a/src/host/ft_host/CanaryTests.cpp b/src/host/ft_host/CanaryTests.cpp index dd15b40fd..26bd6c4f0 100644 --- a/src/host/ft_host/CanaryTests.cpp +++ b/src/host/ft_host/CanaryTests.cpp @@ -11,11 +11,6 @@ using namespace WEX::Common; class CanaryTests { BEGIN_TEST_CLASS(CanaryTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhostv1.dll") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") END_TEST_CLASS() TEST_METHOD(LaunchV1Console); diff --git a/src/host/ft_host/InitTests.cpp b/src/host/ft_host/InitTests.cpp index 7bfe8a5e2..6af42e420 100644 --- a/src/host/ft_host/InitTests.cpp +++ b/src/host/ft_host/InitTests.cpp @@ -45,6 +45,23 @@ BEGIN_MODULE() MODULE_PROPERTY(L"WinPerf.WPRProfile", L"ConsolePerf.wprp") MODULE_PROPERTY(L"WinPerf.WPRProfileId", L"ConsolePerf.Verbose.File") MODULE_PROPERTY(L"WinPerf.Regions", L"ConsolePerf.Regions.xml") + + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\sdk\\lib\\minwin\\$arch\\api-ms-win-core-console-l1-2-1.lib") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\sdk\\lib\\minwin\\$arch\\api-ms-win-core-console-l2-2-0.lib") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\sdk\\lib\\minwin\\$arch\\api-ms-win-core-console-l3-2-0.lib") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\mincore\\priv_sdk\\lib\\$arch\\api-ms-win-core-console-ansi-l2-1-0.lib") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\minwin\\priv_sdk\\inc\\conmsgl1.h") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\minwin\\priv_sdk\\inc\\conmsgl2.h") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\minwin\\priv_sdk\\inc\\conmsgl3.h") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\internal\\windows\\inc\\winconp.h") + + // Public + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\external\\sdk\\inc\\wincon.h") + MODULE_PROPERTY(L"ArtifactUnderTest", L"onecore\\external\\sdk\\inc\\wincontypes.h") + + // Relative to _NTTREE + MODULE_PROPERTY(L"BinaryUnderTest", L"conhostv1.dll") + MODULE_PROPERTY(L"BinaryUnderTest", L"conhost.exe") END_MODULE() MODULE_SETUP(ModuleSetup) diff --git a/src/host/ft_host/Message_KeyPressTests.cpp b/src/host/ft_host/Message_KeyPressTests.cpp index 680e9b8ae..f073d3b4f 100644 --- a/src/host/ft_host/Message_KeyPressTests.cpp +++ b/src/host/ft_host/Message_KeyPressTests.cpp @@ -30,11 +30,6 @@ using WEX::Logging::Log; class KeyPressTests { BEGIN_TEST_CLASS(KeyPressTests) - TEST_CLASS_PROPERTY(L"BinaryUnderTest", L"conhost.exe") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincon.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"winconp.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"wincontypes.h") - TEST_CLASS_PROPERTY(L"ArtifactUnderTest", L"conmsgl1.h") END_TEST_CLASS() void TurnOffModifierKeys(HWND hwnd) diff --git a/src/host/ft_host/testmd.definition b/src/host/ft_host/testmd.definition index ee3815f41..ca605c2ef 100644 --- a/src/host/ft_host/testmd.definition +++ b/src/host/ft_host/testmd.definition @@ -6,7 +6,7 @@ }, "Execution": { "Type": "TAEF", - "Parameter": "/ScreenCaptureOnError" + "Parameter": "/ScreenCaptureOnError /miniDumpOnError /unsupported_miniDumpOnTimeout" }, "Dependencies": { "Files": [ diff --git a/src/host/ut_host/testmd.definition b/src/host/ut_host/testmd.definition index 0c2cb74a8..d348c98a7 100644 --- a/src/host/ut_host/testmd.definition +++ b/src/host/ut_host/testmd.definition @@ -6,7 +6,7 @@ }, "Execution": { "Type": "TAEF", - "Parameter": "" + "Parameter": "/ScreenCaptureOnError /miniDumpOnError /unsupported_miniDumpOnTimeout" }, "Dependencies": { "Files": [ ],