-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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.
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
[wasm][debugger] Fix source-link test #62786
Conversation
Tagging subscribers to this area: @thaystg Issue DetailsLike this we are still testing the source-link but we don't depend anymore of the git commit id.
|
<PropertyGroup> | ||
<PackageId>LibraryTest</PackageId> | ||
<Version>1.0.0</Version> | ||
<PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
<RepositoryUrl>https://github.com/dotnet/runtime.git</RepositoryUrl> | ||
<RepositoryType>git</RepositoryType> | ||
<EnableSourceLink>true</EnableSourceLink> | ||
<IncludeSymbols>true</IncludeSymbols> | ||
<DebugType>embedded</DebugType> | ||
<IncludeSymbols>true</IncludeSymbols> | ||
<SourceLink>source-link.json</SourceLink> | ||
<DeterministicSourcePaths>true</DeterministicSourcePaths> | ||
<DisableSourceLink>false</DisableSourceLink> | ||
<AppOutputBase>$(MSBuildProjectDirectory)\</AppOutputBase> | ||
<PathMap>$(AppOutputBase)=/fakepath/$(MSBuildProjectDirectory)</PathMap> | ||
</PropertyGroup> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe:
<PropertyGroup> | |
<PackageId>LibraryTest</PackageId> | |
<Version>1.0.0</Version> | |
<PublishRepositoryUrl>true</PublishRepositoryUrl> | |
<RepositoryUrl>https://github.com/dotnet/runtime.git</RepositoryUrl> | |
<RepositoryType>git</RepositoryType> | |
<EnableSourceLink>true</EnableSourceLink> | |
<IncludeSymbols>true</IncludeSymbols> | |
<DebugType>embedded</DebugType> | |
<IncludeSymbols>true</IncludeSymbols> | |
<SourceLink>source-link.json</SourceLink> | |
<DeterministicSourcePaths>true</DeterministicSourcePaths> | |
<DisableSourceLink>false</DisableSourceLink> | |
<AppOutputBase>$(MSBuildProjectDirectory)\</AppOutputBase> | |
<PathMap>$(AppOutputBase)=/fakepath/$(MSBuildProjectDirectory)</PathMap> | |
</PropertyGroup> | |
<PropertyGroup> | |
<PackageId>LibraryTest</PackageId> | |
<Version>1.0.0</Version> | |
</PropertyGroup> | |
<PropertyGroup Condition="'$(ContinuousIntegrationBuild)' == 'true'"> | |
<PublishRepositoryUrl>true</PublishRepositoryUrl> | |
<RepositoryUrl>https://github.com/dotnet/runtime.git</RepositoryUrl> | |
<RepositoryType>git</RepositoryType> | |
<EnableSourceLink>true</EnableSourceLink> | |
<IncludeSymbols>true</IncludeSymbols> | |
<DebugType>embedded</DebugType> | |
<IncludeSymbols>true</IncludeSymbols> | |
<DeterministicSourcePaths>true</DeterministicSourcePaths> | |
<DisableSourceLink>false</DisableSourceLink> | |
</PropertyGroup> | |
<PropertyGroup Condition="'$(ContinuousIntegrationBuild)' != 'true'"> | |
<SourceLink>source-link.json</SourceLink> | |
<DeterministicSourcePaths>true</DeterministicSourcePaths> | |
<AppOutputBase>$(MSBuildProjectDirectory)\</AppOutputBase> | |
<PathMap>$(AppOutputBase)=/fakepath/$(MSBuildProjectDirectory)</PathMap> | |
</PropertyGroup> |
src/mono/wasm/debugger/tests/debugger-test-with-source-link/source-link.json
Show resolved
Hide resolved
Tagging subscribers to 'arch-wasm': @lewing Issue DetailsLike this we are still testing the source-link but we don't depend anymore of the git commit id.
|
<PackageId>LibraryTest</PackageId> | ||
<Version>1.0.0</Version> | ||
<DeterministicSourcePaths>true</DeterministicSourcePaths> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
trailing spaces
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 👍
.. as it is breaking debugger tests build on windows. Issue: dotnet#62892 This reverts commit 8151740.
* [wasm] Don't emit warning if runtimeconfig.json cannot be found Library projects don't have runtimeconfig.json files by default. So, don't make it a warning. Instead, emit a low importance which might be useful when debugging. But library projects can have runtimeconfig.json, like the runtime test projects. So, don't limit processing that by OutputType. IOW, if it's found then use it. * [wasm] Add timestamp to logs * Download dotnet-install script for installing workloads Instead of trying to use the script from `.dotnet`, download the script. `.dotnet` might not exist, for example, when the `global.json` version matches the system installed one. * [wasm] WasmAppBuilder: catch UnauthorizedAccessException also * [wasm] Fix bug in tests Some helper methods have a `Action<JToken>` parameter. Many tests pass an async lambda to this, expecting it to get awaited upon. ```csharp EvaluateAndCheck (Action<T> locals_fn) { ... locals_fn(); // no await ... } async Task Test() { EvaluateAndCheck( async (locals) => { ... CheckNumber(locals, ...); await CheckDateTime(locals, ..); ... } ); } ``` In the above example, roslyn generates an async-void lambda, so the compiler never complains about the async lambda being passed. `EvaluateAndCheck` cannot, and does not await this, but if the lambda happens to block, then it will return at that point, and the test(calling method) will end, without ever completing the lambda. And for most tests, the actual checks are done in that lambda. This gets hit when `CheckDateTimeValue` tries to fetch properties of a `DateTime` object. And it started to show up when adding `ConfigureAwait(false)` to some calls. * [wasm] Add Wasm.Debugger.Tests wrapper project This is a proxy/wrapper project for `src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj`. - Building the project as part of the regular browser-wasm build presents some issues, because of part the tests need use the aspnet sdk, and that doesn't work with `browser-wasm`. - This wrapper project essentially builds the `DebuggerTestSuite` project, with some properties(`TargetFramework;TargetFrameworks;Configuration;TargetOS;TargetArchitecture`) removed so they don't propogate from the parent build. - And it packages it up for running the tests on helix - I did try to convert `DebuggerTestSuite` into a `Wasm.Debugger.Tests`, and make it use the library tests infrastructure, but ran into an issue - it built the project with no `testhost.dll`, so can't use `dotnet test` - it did get `xunit.console.dll`, but that would fail to run the tests because of missing `System.Runtime` (and I'm guessing, other assemblies) - attempts to publish the project failed - So, for now, this is what we have! * [wasm][tests] Make them friendly to running outside the tree .. like on helix. Add new `DEBUGGER_TEST_PATH`, and `CHROME_PATH_FOR_DEBUGGER_TESTS` which will be set for helix. And change the appbundle directory name from the misleading `publish/` to `AppBundle/`. * [wasm] Tests.cs -> MiscTests.cs * [wasm] Add support for submitting debugger tests to helix Also, added `eng/testing/scenarios/WasmDebuggerTestsJobsList.txt` which is a manually generated list of test classes. This will be changed to be generated at runtime, in an upcoming PR. * [wasm] Add debugger tests job for linux, and windows They follow the same pattern as other wasm jobs: - build when isFullMatrix - build in runtime-manual - Additionally, build when there are changes in: ``` - src/mono/wasm/debugger/* - src/mono/wasm/runtime/* - src/mono/mono/* ``` * [wasm] Add new make targets to submit tests to helix `submit-debugger-tests-helix` `submit-tests-helix` - submits any library test archives * Build Wasm.Debugger.Tests from src/libraries/tests.proj * DebuggerTestSuite: Copy files for the test archive * [wasm] Fix HarnessTests.BrowserClose * [wasm] Fix building `ApplyUpdateReferencedAssembly` project on CI Essentially, disable use of SourceLink which gets enabled by default when using `-p:ContinuousIntegrationBuild=true`. Issue: #62618 * cleanup * Wasm.Build.Tests: add missing file * [wasm] sendtohelixhelp.proj: Error out if there is more than one zip .. file when running for Wasm.Build.Tests, or Wasm.Debugger.Tests . * [wasm] Disable DebuggerTests.ArrayTests on helix Issue: #62661 Using `[Trait..` instead of `ActiveIssue` because: #62660 * disable non-wasma builds * sendtohelixhelp.proj: guard against no payload found * Disable more tests * add back builds * [wasm][debugger] Disable failing debugger test `DebuggerTests.BreakpointTests.BreakpointInAssemblyUsingTypeFromAnotherAssembly_BothDynamicallyLoaded` Issue: #62823 * Try to fix windows command line * Move debugger-tests for linux to runtime-staging * Revert "[wasm][debugger] Fix source-link test (#62786)" .. as it is breaking debugger tests build on windows. Issue: #62892 This reverts commit 8151740.
Like this we are still testing the source-link but we don't depend anymore of the git commit id.
Fix #62551