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
apply patch that allow configuring bundleDir 
see: #69441 (comment)
  • Loading branch information
@yamachu
yamachu committed Jul 27, 2022
commit eb07469f47f3fac81443a390e55b0f50859ce2ec
3 changes: 2 additions & 1 deletion src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ protected string RunAndTestWasmApp(BuildArgs buildArgs,
string id,
Action<string>? test=null,
string? buildDir = null,
string? bundleDir = null,
int expectedExitCode = 0,
string? args = null,
Dictionary<string, string>? envVars = null,
Expand All @@ -152,7 +153,7 @@ protected string RunAndTestWasmApp(BuildArgs buildArgs,
envVars[kvp.Key] = kvp.Value;
}

string bundleDir = Path.Combine(GetBinDir(baseDir: buildDir, config: buildArgs.Config, targetFramework: targetFramework), "AppBundle");
bundleDir ??= Path.Combine(GetBinDir(baseDir: buildDir, config: buildArgs.Config, targetFramework: targetFramework), "AppBundle");

// Use wasm-console.log to get the xharness output for non-browser cases
(string testCommand, string extraXHarnessArgs, bool useWasmConsoleOutput) = host switch
Expand Down
36 changes: 13 additions & 23 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 @@ -29,38 +29,28 @@ public void RunOutOfAppBundle(BuildArgs buildArgs, RunHost host, string id)

string binDir = GetBinDir(baseDir: _projectDir!, config: buildArgs.Config);
string appBundleDir = Path.Combine(binDir, "AppBundle");
string tmpBundleDirName = "AppBundleTmp";
string tmpBundleDir = Path.Combine(binDir, tmpBundleDirName);
string outerDir = Path.GetFullPath(Path.Combine(appBundleDir, ".."));

string tmpDir = Path.Combine(Path.GetTempPath(), $"{id}-{buildArgs.ProjectName}");

if (host == RunHost.Chrome)
if (host is RunHost.Chrome)
{
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");
// Delete the original one, so we don't use that by accident
if (File.Exists(indexHtmlPath))
File.Delete(indexHtmlPath);

indexHtmlPath = Path.Combine(outerDir, "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 {
Utils.DirectoryCopy(appBundleDir, tmpDir);
}

RunAndTestWasmApp(buildArgs, expectedExitCode: 42, host: host, id: id, jsRelativePath: Path.Combine(tmpDir, "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(tmpDir, true);
}
RunAndTestWasmApp(buildArgs,
expectedExitCode: 42,
host: host,
id: id,
bundleDir: outerDir,
jsRelativePath: "./AppBundle/test-main.js");
}
}