Skip to content

[tests][exceptions] Abbreviate long native test path #116841

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
merged 2 commits into from
Jun 20, 2025
Merged

[tests][exceptions] Abbreviate long native test path #116841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6067c8b
[Tests][Exceptions] Abbreviate UnhandeldExceptionHandler tests
mdh1418 Jun 19, 2025
51a78e7
[Tests][Exceptions] Rename to distinguish from UnhandledExceptionHand…
mdh1418 Jun 19, 2025
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
15 changes: 15 additions & 0 deletions src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
project (ForeignUnhandledNative)

include_directories(${INC_PLATFORM_DIR})

set(SOURCES ForeignUnhandledNative.cpp)

if(NOT CLR_CMAKE_HOST_WIN32)
add_compile_options(-pthread)
endif()

# add the executable
add_library (ForeignUnhandledNative SHARED ${SOURCES})

# add the install targets
install (TARGETS ForeignUnhandledNative DESTINATION bin)
6 changes: 3 additions & 3 deletions ...ndled/ForeignThreadRevPInvokeUnhandled.cs → ...eptionHandler/Foreign/ForeignUnhandled.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

public delegate void MyCallback();

public class PInvokeRevPInvokeUnhandled
public class ForeignUnhandled
{
[DllImport("ForeignThreadRevPInvokeUnhandled")]
Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure how this dllimport resolved before when the file and cmake used ForeignThreadRevPInvokeUnhandledNative

[DllImport("ForeignUnhandledNative")]
public static extern void InvokeCallbackOnNewThread(MyCallback callback);

[ThreadStatic]
Expand All @@ -30,7 +30,7 @@ private static void SetHandler()
}

// test-wide setup
static PInvokeRevPInvokeUnhandled()
static ForeignUnhandled()
{
AppDomain.CurrentDomain.UnhandledException += (_, _) =>
{
Expand Down
2 changes: 1 addition & 1 deletion ...handled/PInvokeRevPInvokeUnhandled.csproj → ...onHandler/Foreign/ForeignUnhandled.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<MonoAotIncompatible>true</MonoAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="PInvokeRevPInvokeUnhandled.cs" />
<Compile Include="ForeignUnhandled.cs" />
</ItemGroup>
<ItemGroup>
<CMakeProjectReference Include="CMakeLists.txt" />
Expand Down
0 ...oreignThreadRevPInvokeUnhandledNative.cpp → ...andler/Foreign/ForeignUnhandledNative.cpp
View file
Open in desktop
File renamed without changes.
15 changes: 0 additions & 15 deletions ...ices/exceptions/UnhandledExceptionHandler/ForeignThreadRevPInvokeUnhandled/CMakeLists.txt
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
project (PInvokeUnhandledNative)

include_directories(${INC_PLATFORM_DIR})

set(SOURCES PInvokeUnhandledNative.cpp)

if(NOT CLR_CMAKE_HOST_WIN32)
add_compile_options(-pthread)
endif()

# add the executable
add_library (PInvokeUnhandledNative SHARED ${SOURCES})

# add the install targets
install (TARGETS PInvokeUnhandledNative DESTINATION bin)
6 changes: 3 additions & 3 deletions ...keUnhandled/PInvokeRevPInvokeUnhandled.cs → ...eptionHandler/PInvoke/PInvokeUnhandled.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

public delegate void MyCallback();

public class PInvokeRevPInvokeUnhandled
public class PInvokeUnhandled
{
[DllImport("PInvokeRevPInvokeUnhandledNative")]
[DllImport("PInvokeUnhandledNative")]
public static extern void InvokeCallback(MyCallback callback);

[ThreadStatic]
Expand All @@ -30,7 +30,7 @@ private static void SetHandler()
}

// test-wide setup
static PInvokeRevPInvokeUnhandled()
static PInvokeUnhandled()
{
AppDomain.CurrentDomain.UnhandledException += (_, _) =>
{
Expand Down
2 changes: 1 addition & 1 deletion ...d/ForeignThreadRevPInvokeUnhandled.csproj → ...onHandler/PInvoke/PInvokeUnhandled.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<MonoAotIncompatible>true</MonoAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="ForeignThreadRevPInvokeUnhandled.cs" />
<Compile Include="PInvokeUnhandled.cs" />
</ItemGroup>
<ItemGroup>
<CMakeProjectReference Include="CMakeLists.txt" />
Expand Down
0 ...dled/PInvokeRevPInvokeUnhandledNative.cpp → ...andler/PInvoke/PInvokeUnhandledNative.cpp
View file
Open in desktop
File renamed without changes.
15 changes: 0 additions & 15 deletions ...seservices/exceptions/UnhandledExceptionHandler/PInvokeRevPInvokeUnhandled/CMakeLists.txt
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/tests/baseservices/exceptions/unhandled/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
project (foreignunhandled)
project (unhandlednative)

include_directories(${INC_PLATFORM_DIR})

set(SOURCES foreignunhandled.cpp)
set(SOURCES unhandlednative.cpp)

if(NOT CLR_CMAKE_HOST_WIN32)
add_compile_options(-pthread)
endif()

# add the executable
add_library (foreignunhandled SHARED ${SOURCES})
add_library (unhandlednative SHARED ${SOURCES})

# add the install targets
install (TARGETS foreignunhandled DESTINATION bin)
install (TARGETS unhandlednative DESTINATION bin)
2 changes: 1 addition & 1 deletion src/tests/baseservices/exceptions/unhandled/unhandled.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace TestUnhandledException

unsafe class Program
{
[DllImport("foreignunhandled")]
[DllImport("unhandlednative")]
public static extern void InvokeCallbackOnNewThread(delegate*unmanaged<void> callBack);

private const string INTERNAL_CALL = "__internal";
Expand Down
0 ...exceptions/unhandled/foreignunhandled.cpp → .../exceptions/unhandled/unhandlednative.cpp
View file
Open in desktop
File renamed without changes.
Loading