Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/BuildPublishTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public BuildPublishTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
}

[Theory]
[BuildAndRun(host: RunHost.V8, aot: false, config: "Release")]
[BuildAndRun(host: RunHost.V8, aot: false, config: "Debug")]
[BuildAndRun(host: RunHost.Chrome, aot: false, config: "Release")]
[BuildAndRun(host: RunHost.Chrome, aot: false, config: "Debug")]
public void BuildThenPublishNoAOT(BuildArgs buildArgs, RunHost host, string id)
{
string projectName = $"build_publish_{buildArgs.Config}";
Expand Down Expand Up @@ -70,8 +70,8 @@ void Run() => RunAndTestWasmApp(
}

[Theory]
[BuildAndRun(host: RunHost.V8, aot: true, config: "Release")]
[BuildAndRun(host: RunHost.V8, aot: true, config: "Debug")]
[BuildAndRun(host: RunHost.Chrome, aot: true, config: "Release")]
[BuildAndRun(host: RunHost.Chrome, aot: true, config: "Debug")]
public void BuildThenPublishWithAOT(BuildArgs buildArgs, RunHost host, string id)
{
string projectName = $"build_publish_{buildArgs.Config}";
Expand Down Expand Up @@ -108,7 +108,6 @@ public void BuildThenPublishWithAOT(BuildArgs buildArgs, RunHost host, string id
File.Move(product!.LogFile, Path.ChangeExtension(product.LogFile!, ".first.binlog"));

_testOutput.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}");
//_testOutput.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}");

// relink by default for Release+publish
(_, output) = BuildProject(buildArgs,
Expand Down
2 changes: 2 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ protected string RunAndTestWasmApp(BuildArgs buildArgs,
}

bundleDir ??= Path.Combine(GetBinDir(baseDir: buildDir, config: buildArgs.Config, targetFramework: targetFramework), "AppBundle");
if (host is RunHost.V8 && OperatingSystem.IsWindows())
throw new InvalidOperationException("Running tests with V8 on windows isn't supported");

// Use wasm-console.log to get the xharness output for non-browser cases
(string testCommand, string extraXHarnessArgs, bool useWasmConsoleOutput) = host switch
Expand Down
6 changes: 6 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/HelperExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ public static class HelperExtensions
if (value == RunHost.None)
continue;

if (value == RunHost.V8 && OperatingSystem.IsWindows())
{
// Don't run tests with V8 on windows
continue;
}

// Ignore any combos like RunHost.All from Enum.GetValues
// by ignoring any @value that has more than 1 bit set
if (((int)value & ((int)value - 1)) != 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public FlagsChangeRebuildTest(ITestOutputHelper output, SharedBuildPerTestClassF
new object[] { /*cflags*/ "/p:EmccExtraCFlags=-g", /*ldflags*/ "" },
new object[] { /*cflags*/ "", /*ldflags*/ "/p:EmccExtraLDFlags=-g" },
new object[] { /*cflags*/ "/p:EmccExtraCFlags=-g", /*ldflags*/ "/p:EmccExtraLDFlags=-g" }
).WithRunHosts(RunHost.V8).UnwrapItemsAsArrays();
).WithRunHosts(RunHost.Chrome).UnwrapItemsAsArrays();

[Theory]
[MemberData(nameof(FlagsChangesForNativeRelinkingData), parameters: /*aot*/ false)]
Expand Down Expand Up @@ -71,7 +71,7 @@ public void ExtraEmccFlagsSetButNoRealChange(BuildArgs buildArgs, string extraCF
=> ConfigWithAOTData(aot, config: "Release").Multiply(
new object[] { /*cflags*/ "/p:EmccCompileOptimizationFlag=-O1", /*ldflags*/ "" },
new object[] { /*cflags*/ "", /*ldflags*/ "/p:EmccLinkOptimizationFlag=-O0" }
).WithRunHosts(RunHost.V8).UnwrapItemsAsArrays();
).WithRunHosts(RunHost.Chrome).UnwrapItemsAsArrays();

[Theory]
[MemberData(nameof(FlagsOnlyChangeData), parameters: /*aot*/ false)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public NativeRebuildTestsBase(ITestOutputHelper output, SharedBuildPerTestClassF
IEnumerable<object?[]> GetData(bool aot, bool nativeRelinking, bool invariant)
=> ConfigWithAOTData(aot)
.Multiply(new object[] { nativeRelinking, invariant })
.WithRunHosts(RunHost.V8)
.WithRunHosts(RunHost.Chrome)
.UnwrapItemsAsArrays().ToList();
}

Expand All @@ -55,7 +55,7 @@ public NativeRebuildTestsBase(ITestOutputHelper output, SharedBuildPerTestClassF
HasIcudt: !invariant,
CreateProject: true));

RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: RunHost.V8, id: id);
RunAndTestWasmApp(buildArgs, buildDir: _projectDir, expectedExitCode: 42, host: RunHost.Chrome, id: id);
return (buildArgs, GetBuildPaths(buildArgs));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public PInvokeTableGeneratorTests(ITestOutputHelper output, SharedBuildPerTestCl
}

[Theory]
[BuildAndRun(host: RunHost.V8)]
[BuildAndRun(host: RunHost.Chrome)]
public void NativeLibraryWithVariadicFunctions(BuildArgs buildArgs, RunHost host, string id)
{
string code = @"
Expand Down Expand Up @@ -55,7 +55,7 @@ public static int Main(string[] args)
}

[Theory]
[BuildAndRun(host: RunHost.V8)]
[BuildAndRun(host: RunHost.Chrome)]
public void DllImportWithFunctionPointersCompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
{
string code = @"
Expand Down Expand Up @@ -87,7 +87,7 @@ public static int Main()
}

[Theory]
[BuildAndRun(host: RunHost.V8)]
[BuildAndRun(host: RunHost.Chrome)]
public void DllImportWithFunctionPointers_ForVariadicFunction_CompilesWithWarning(BuildArgs buildArgs, RunHost host, string id)
{
string code = @"
Expand Down Expand Up @@ -116,7 +116,7 @@ public static int Main()
}

[Theory]
[BuildAndRun(host: RunHost.V8, parameters: new object[] { "tr_TR.UTF-8" })]
[BuildAndRun(host: RunHost.Chrome, parameters: new object[] { "tr_TR.UTF-8" })]
public void BuildNativeInNonEnglishCulture(BuildArgs buildArgs, string culture, RunHost host, string id)
{
// Check that we can generate interp tables in non-english cultures
Expand Down
2 changes: 1 addition & 1 deletion src/tests/BuildWasmApps/Wasm.Build.Tests/RebuildTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public RebuildTests(ITestOutputHelper output, SharedBuildPerTestClassFixture bui

public static IEnumerable<object?[]> NonNativeDebugRebuildData()
=> ConfigWithAOTData(aot: false, config: "Debug")
.WithRunHosts(RunHost.V8)
.WithRunHosts(RunHost.Chrome)
.UnwrapItemsAsArrays().ToList();

[Theory]
Expand Down