Change test lib name so it doesn't clash with managed DLL on Windows

dotnet · Jul 18, 2024 · c100e85 · c100e85
1 parent 5d7a188
commit c100e85
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (PrimitiveABI)
+project (PrimitiveABINative)
 include_directories(${INC_PLATFORM_DIR})
 
 if(CLR_CMAKE_HOST_WIN32)
@@ -7,6 +7,6 @@ else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Oz")
 endif()
 
-add_library (PrimitiveABI SHARED PrimitiveABI.c)
+add_library (PrimitiveABINative SHARED PrimitiveABI.c)
 
-install (TARGETS PrimitiveABI DESTINATION bin)
+install (TARGETS PrimitiveABINative DESTINATION bin)
diff --git a/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs b/src/tests/JIT/Directed/PrimitiveABI/PrimitiveABI.cs
@@ -9,7 +9,7 @@
 public static class Program
 {
 #region ExtendedUint_RiscVTests
-	[DllImport("PrimitiveABI")]
+	[DllImport("PrimitiveABINative")]
 	public static extern long Echo_ExtendedUint_RiscV(int a0, uint a1);
 
 	[MethodImpl(MethodImplOptions.NoInlining)]
@@ -41,7 +41,7 @@ public static void Test_ExtendedUint_ByReflection_RiscV()
 		Assert.Equal(ret, native);
 	}
 
-	[DllImport("PrimitiveABI")]
+	[DllImport("PrimitiveABINative")]
 	public static extern long Echo_ExtendedUint_OnStack_RiscV(
 		int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, uint stack0);
 
@@ -77,7 +77,7 @@ public static void Test_ExtendedUint_OnStack_ByReflection_RiscV()
 #endregion
 
 #region Float_RiscVTests
-	[DllImport("PrimitiveABI")]
+	[DllImport("PrimitiveABINative")]
 	public static extern double Echo_Float_RiscV(float fa0, float fa1);
 
 	[MethodImpl(MethodImplOptions.NoInlining)]
@@ -109,7 +109,7 @@ public static void Test_Float_ByReflection_RiscV()
 		Assert.Equal(ret, native);
 	}
 
-	[DllImport("PrimitiveABI")]
+	[DllImport("PrimitiveABINative")]
 	public static extern double Echo_Float_InIntegerReg_RiscV(
 		float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7, float a0);
 
@@ -143,7 +143,7 @@ public static void Test_Float_InIntegerReg_ByReflection_RiscV()
 		Assert.Equal(ret, native);
 	}
 
-	[DllImport("PrimitiveABI")]
+	[DllImport("PrimitiveABINative")]
 	public static extern double Echo_Float_OnStack_RiscV(
 		float fa0, float fa1, float fa2, float fa3, float fa4, float fa5, float fa6, float fa7,
 		int a0, int a1, int a2, int a3, int a4, int a5, int a6, int a7, float stack0);