Skip to content

[wasm][wbt] Test that dotnet.js could be run from any current directory #69441

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

Merged
radical merged 10 commits into from
Jul 28, 2022
Merged

[wasm][wbt] Test that dotnet.js could be run from any current directory #69441

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5f10f5
Rebase resolve-asset-path-by-locatefile onto main with reset runtime …
yamachu Jul 26, 2022
2db7974
apply suggestions that assign configSrc
yamachu Jul 26, 2022
2952c7b
apply suggestions
yamachu Jul 26, 2022
3922e05
Add tests to BuildWasmAppsJobs
yamachu Jul 26, 2022
d651c70
add jsRelativePath args instead of using extraXHarnessMonoArgs hack
yamachu Jul 26, 2022
2f1c9eb
Copy AppBundle directory and treat it as the test target.
yamachu Jul 26, 2022
b6804be
convert to file scoped namespace style
yamachu Jul 27, 2022
5a94685
use tmp directory to avoid running overlap
yamachu Jul 27, 2022
930c701
use Utils.DirectoryCopy
yamachu Jul 27, 2022
eb07469
apply patch that allow configuring bundleDir
yamachu Jul 27, 2022
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
Prev Previous commit
Next Next commit
convert to file scoped namespace style
  • Loading branch information
@yamachu
yamachu committed Jul 27, 2022
commit b6804be3856f3ce34ab728370f0af0647ff7f4a0
49 changes: 24 additions & 25 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/ConfigSrcTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,31 @@

#nullable enable

namespace Wasm.Build.Tests
namespace Wasm.Build.Tests;

public class ConfigSrcTests : BuildTestBase
{
public class ConfigSrcTests : BuildTestBase
public ConfigSrcTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) : base(output, buildContext)
{}

// NOTE: port number determinizes dynamically, so could not generate absolute URI
[Theory]
[BuildAndRun(host: RunHost.V8 | RunHost.NodeJS)]
public void ConfigSrcAbsolutePath(BuildArgs buildArgs, RunHost host, string id)
{
public ConfigSrcTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) : base(output, buildContext)
{}

// NOTE: port number determinizes dynamically, so could not generate absolute URI
[Theory]
[BuildAndRun(host: RunHost.V8 | RunHost.NodeJS)]
public void ConfigSrcAbsolutePath(BuildArgs buildArgs, RunHost host, string id)
{
buildArgs = buildArgs with { ProjectName = $"configsrcabsolute_{buildArgs.Config}_{buildArgs.AOT}" };
buildArgs = ExpandBuildArgs(buildArgs);

BuildProject(buildArgs,
id: id,
new BuildProjectOptions(
InitProject: () => File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), s_mainReturns42),
DotnetWasmFromRuntimePack: !(buildArgs.AOT || buildArgs.Config == "Release")));

string binDir = GetBinDir(baseDir: _projectDir!, config: buildArgs.Config);
string bundleDir = Path.Combine(binDir, "AppBundle");
string configSrc = Path.GetFullPath(Path.Combine(bundleDir, "mono-config.json"));

RunAndTestWasmApp(buildArgs, expectedExitCode: 42, host: host, id: id, extraXHarnessMonoArgs: $"--config-src={configSrc}");
}
buildArgs = buildArgs with { ProjectName = $"configsrcabsolute_{buildArgs.Config}_{buildArgs.AOT}" };
buildArgs = ExpandBuildArgs(buildArgs);

BuildProject(buildArgs,
id: id,
new BuildProjectOptions(
InitProject: () => File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), s_mainReturns42),
DotnetWasmFromRuntimePack: !(buildArgs.AOT || buildArgs.Config == "Release")));

string binDir = GetBinDir(baseDir: _projectDir!, config: buildArgs.Config);
string bundleDir = Path.Combine(binDir, "AppBundle");
string configSrc = Path.GetFullPath(Path.Combine(bundleDir, "mono-config.json"));

RunAndTestWasmApp(buildArgs, expectedExitCode: 42, host: host, id: id, extraXHarnessMonoArgs: $"--config-src={configSrc}");
}
}
111 changes: 55 additions & 56 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/WasmRunOutOfAppBundleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,77 +7,76 @@

#nullable enable

namespace Wasm.Build.Tests
namespace Wasm.Build.Tests;

public class WasmRunOutOfAppBundleTests : BuildTestBase
{
public class WasmRunOutOfAppBundleTests : BuildTestBase
public WasmRunOutOfAppBundleTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) : base(output, buildContext)
{}

[Theory]
[BuildAndRun]
public void RunOutOfAppBundle(BuildArgs buildArgs, RunHost host, string id)
{
public WasmRunOutOfAppBundleTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) : base(output, buildContext)
{}
buildArgs = buildArgs with { ProjectName = $"outofappbundle_{buildArgs.Config}_{buildArgs.AOT}" };
buildArgs = ExpandBuildArgs(buildArgs);

[Theory]
[BuildAndRun]
public void RunOutOfAppBundle(BuildArgs buildArgs, RunHost host, string id)
{
buildArgs = buildArgs with { ProjectName = $"outofappbundle_{buildArgs.Config}_{buildArgs.AOT}" };
buildArgs = ExpandBuildArgs(buildArgs);
BuildProject(buildArgs,
id: id,
new BuildProjectOptions(
InitProject: () => File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), s_mainReturns42),
DotnetWasmFromRuntimePack: !(buildArgs.AOT || buildArgs.Config == "Release")));

BuildProject(buildArgs,
id: id,
new BuildProjectOptions(
InitProject: () => File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), s_mainReturns42),
DotnetWasmFromRuntimePack: !(buildArgs.AOT || buildArgs.Config == "Release")));
string binDir = GetBinDir(baseDir: _projectDir!, config: buildArgs.Config);
string appBundleDir = Path.Combine(binDir, "AppBundle");
string tmpBundleDirName = "AppBundleTmp";
string tmpBundleDir = Path.Combine(binDir, tmpBundleDirName);

string binDir = GetBinDir(baseDir: _projectDir!, config: buildArgs.Config);
string appBundleDir = Path.Combine(binDir, "AppBundle");
string tmpBundleDirName = "AppBundleTmp";
string tmpBundleDir = Path.Combine(binDir, tmpBundleDirName);
if (host == RunHost.Chrome)
{
Directory.Move(appBundleDir, tmpBundleDir);
Directory.CreateDirectory(appBundleDir);
// Create $binDir/AppBundle/AppBundle
Directory.Move(tmpBundleDir, Path.Combine(appBundleDir, "AppBundle"));

if (host == RunHost.Chrome)
string indexHtmlPath = Path.Combine(appBundleDir, "index.html");
if (!File.Exists(indexHtmlPath))
{
Directory.Move(appBundleDir, tmpBundleDir);
Directory.CreateDirectory(appBundleDir);
// Create $binDir/AppBundle/AppBundle
Directory.Move(tmpBundleDir, Path.Combine(appBundleDir, "AppBundle"));

string indexHtmlPath = Path.Combine(appBundleDir, "index.html");
if (!File.Exists(indexHtmlPath))
{
var html = @"<html><body><script type=""module"" src=""./AppBundle/test-main.js""></script></body></html>";
File.WriteAllText(indexHtmlPath, html);
}
} else {
CopyAllFiles(appBundleDir, tmpBundleDir);
var html = @"<html><body><script type=""module"" src=""./AppBundle/test-main.js""></script></body></html>";
File.WriteAllText(indexHtmlPath, html);
}
} else {
CopyAllFiles(appBundleDir, tmpBundleDir);
}

RunAndTestWasmApp(buildArgs, expectedExitCode: 42, host: host, id: id, jsRelativePath: $"../{tmpBundleDirName}/test-main.js");
RunAndTestWasmApp(buildArgs, expectedExitCode: 42, host: host, id: id, jsRelativePath: $"../{tmpBundleDirName}/test-main.js");

// Restore AppBundle Dir
if (host == RunHost.Chrome)
{
Directory.Move(Path.Combine(appBundleDir, "AppBundle"), tmpBundleDir);
Directory.Delete(appBundleDir, true);
Directory.Move(tmpBundleDir, appBundleDir);
} else {
Directory.Delete(tmpBundleDir, true);
}
// Restore AppBundle Dir
if (host == RunHost.Chrome)
{
Directory.Move(Path.Combine(appBundleDir, "AppBundle"), tmpBundleDir);
Directory.Delete(appBundleDir, true);
Directory.Move(tmpBundleDir, appBundleDir);
} else {
Directory.Delete(tmpBundleDir, true);
}
}

private void CopyAllFiles(string srcDir, string destDir)
private void CopyAllFiles(string srcDir, string destDir)
{
if (!Directory.Exists(destDir))
{
if (!Directory.Exists(destDir))
{
Directory.CreateDirectory(destDir);
}
Directory.CreateDirectory(destDir);
}

foreach (var file in Directory.GetFiles(srcDir))
{
File.Copy(file, Path.Combine(destDir, Path.GetFileName(file)), true);
}
foreach (var file in Directory.GetFiles(srcDir))
{
File.Copy(file, Path.Combine(destDir, Path.GetFileName(file)), true);
}

foreach (var directory in Directory.GetDirectories(srcDir))
{
CopyAllFiles(directory, Path.Combine(destDir, Path.GetFileName(directory)));
}
foreach (var directory in Directory.GetDirectories(srcDir))
{
CopyAllFiles(directory, Path.Combine(destDir, Path.GetFileName(directory)));
}
}
}