inbox: reflect incoming changes up to uxp aa5182a2 (#1916)

2019-07-10 12:40:51 -07:00 · 2019-07-10 12:40:51 -07:00 · 3e5bb99478
parent b970356600
commit 3e5bb99478
19 changed files with 19 additions and 95 deletions
--- 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)
--- 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);
--- 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);
--- 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);
--- 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);
--- 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)
--- 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);
--- 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);
--- 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);
--- 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);
--- 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.
--- 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)
--- 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);
--- 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);
--- 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);
--- 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)
--- 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)
--- 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": [ 
--- 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": [ ],