Skip to content

BundleProbeTest: Enable disabled tests#36327

Merged
swaroop-sridhar merged 1 commit intodotnet:masterfrom
swaroop-sridhar:bool
May 13, 2020
Merged

BundleProbeTest: Enable disabled tests#36327
swaroop-sridhar merged 1 commit intodotnet:masterfrom
swaroop-sridhar:bool

Conversation

@swaroop-sridhar
Copy link
Contributor

A few of the bundle probe tests were failing on Linux-musl-x64-release.
This change adjusts the test to circumvent the failure.

Fixes #35755

@ghost
Copy link

ghost commented May 13, 2020

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

@ghost
Copy link

ghost commented May 13, 2020

Tagging subscribers to this area: @swaroop-sridhar
Notify danmosemsft if you want to be subscribed.

A few of the bundle probe tests were failing on Linux-musl-x64-release.
This change adjusts the test to circumvent the failure.

Fixes dotnet#35755
// Therefore the type on this test is adjusted to circumvent the failure.
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
public delegate bool BundleProbeDelegate([MarshalAs(UnmanagedType.LPWStr)] string path, IntPtr size, IntPtr offset);
public delegate byte BundleProbeDelegate([MarshalAs(UnmanagedType.LPWStr)] string path, IntPtr size, IntPtr offset);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this ok to be LPWstr or should become IntPtr?
If the goal is to inline or avoid a stub, can that happen if the call needs to pin the string?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes the LPWstr is OK.
I spoke with @jkoritzinsky about this today, looks like the problem was wrt managed bool vs native bool values in the return type. Please see: #36372.

@VSadov
Copy link
Member

VSadov commented May 13, 2020

Will existing scenarios use this code path? (without singlefilehost).
I mean - the tests are passing. Does it mean we are all ok here?

@swaroop-sridhar
Copy link
Contributor Author

swaroop-sridhar commented May 13, 2020

Will existing scenarios use this code path? (without singlefilehost).
I mean - the tests are passing. Does it mean we are all ok here?

@VSadov In the non-single-file case, we simply check that the BUNDLE_PROBE property is not passed to the runtime.

@swaroop-sridhar swaroop-sridhar merged commit 6ba9499 into dotnet:master May 13, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Dec 9, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Installer test BundleProbe.Bundle_Probe_Passed_For_Single_File_App failures on Linux_musl x64

4 participants