Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix inner loop solution test runs #3359

Merged
merged 2 commits into from
Oct 30, 2020
Merged

Fix inner loop solution test runs #3359

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efdfd12
Update the test infra to account for the test app having a different …
StephenLPeters Oct 1, 2020
71b9117
Merge remote-tracking branch 'origin/master' into user/stpete/FixInne…
StephenLPeters Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions test/testinfra/MUXTestInfra/Infra/TestEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ public static TestApplicationInfo MUXControlsTestApp
}
}

public static TestApplicationInfo MUXControlsInnerLoopTestApp
{
get
{
#if USING_TAEF
string testAppName = "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe!taef.executionengine.universal.App";
#else
string testAppName = "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe!App";
#endif
return new TestApplicationInfo("MUXControlsTestApp", testAppName, "MUXControlsInnerLoopTestApp_8wekyb3d8bbwe", "MUXControlsInnerLoopTestApp", "MUXControlsTestApp", "MUXControlsTestApp", MUXCertSerialNumber, MUXBaseAppxDir);
}
}

public static TestApplicationInfo NugetPackageTestApp
{
get
Expand Down Expand Up @@ -197,7 +210,11 @@ public static void AssemblyInitialize(TestContext testContext, string certFileNa

public static void AssemblyCleanup()
{
#if INNERLOOP_BUILD
AssemblyCleanupWorker(TestApplicationInfo.MUXControlsInnerLoopTestApp);
#else
AssemblyCleanupWorker(TestApplicationInfo.MUXControlsTestApp);
#endif
}

public static void AssemblyCleanupWorker(TestApplicationInfo testAppInfo)
Expand Down Expand Up @@ -233,7 +250,11 @@ private static Application CreateApplication(TestApplicationInfo info)

public static void Initialize(TestContext testContext)
{
#if INNERLOOP_BUILD
Initialize(testContext, TestApplicationInfo.MUXControlsInnerLoopTestApp);
#else
Initialize(testContext, TestApplicationInfo.MUXControlsTestApp);
#endif
}

// Tests classes call this from their ClassInitialize methods to init our Application instance
Expand Down
2 changes: 2 additions & 0 deletions test/testinfra/MUXTestInfra/MSTest/MUXTestInfra.MSTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v2.1</TargetFrameworkVersion>

<DefineConstants Condition="$(SolutionName) == 'MUXControlsInnerLoop'">$(DefineConstants);INNERLOOP_BUILD</DefineConstants>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions test/testinfra/MUXTestInfra/TAEF/MUXTestInfra.TAEF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<TargetFrameworkVersion>v2.1</TargetFrameworkVersion>

<DefineConstants>$(DefineConstants);USING_TAEF</DefineConstants>
<DefineConstants Condition="$(SolutionName) == 'MUXControlsInnerLoop'">$(DefineConstants);INNERLOOP_BUILD</DefineConstants>

<TaefRootDirectory>$(NuGetPackageRoot)taef.redist.wlk\10.31.180822002\build\Binaries\x86\CoreClr\</TaefRootDirectory>
</PropertyGroup>
Expand Down