Partially enable Generics test for CppCodeGen

dotnet · Oct 29, 2018 · 698a30e · 698a30e
1 parent d195caa
commit 698a30e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/src/Simple/Generics/Generics.cs b/tests/src/Simple/Generics/Generics.cs
@@ -18,22 +18,23 @@ static int Main()
         TestDelegateToCanonMethods.Run();
         TestVirtualMethodUseTracking.Run();
         TestSlotsInHierarchy.Run();
-        TestReflectionInvoke.Run();
         TestDelegateVirtualMethod.Run();
         TestDelegateInterfaceMethod.Run();
         TestThreadStaticFieldAccess.Run();
         TestConstrainedMethodCalls.Run();
         TestInstantiatingUnboxingStubs.Run();
-        TestMDArrayAddressMethod.Run();
         TestNameManglingCollisionRegression.Run();
         TestSimpleGVMScenarios.Run();
         TestGvmDelegates.Run();
         TestGvmDependencies.Run();
-        TestFieldAccess.Run();
-        TestNativeLayoutGeneration.Run();
         TestInterfaceVTableTracking.Run();
         TestClassVTableTracking.Run();
-
+#if !CODEGEN_CPP
+        TestReflectionInvoke.Run();
+        TestMDArrayAddressMethod.Run();
+        TestFieldAccess.Run();
+        TestNativeLayoutGeneration.Run();
+#endif
         return 100;
     }
 

diff --git a/tests/src/Simple/Generics/no_cpp b/tests/src/Simple/Generics/no_cpp
diff --git a/tests/src/Simple/PInvoke/PInvoke.csproj b/tests/src/Simple/PInvoke/PInvoke.csproj
@@ -14,7 +14,6 @@
     <NativeObjectExt Condition="'$(OS)' != 'Windows_NT'">.o</NativeObjectExt>
     <PInvokeNativeObject>$(IntermediateOutputPath)$(OutputName)$(NativeObjectExt)</PInvokeNativeObject>
     <DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
-    <DefineConstants Condition="$(NativeCodeGen) == 'cpp'">$(DefineConstants);CODEGEN_CPP</DefineConstants>
     <UseDebugCrt Condition="'$(Configuration)' == 'Debug'">true</UseDebugCrt>
   </PropertyGroup>
 

diff --git a/tests/src/Simple/SimpleTest.targets b/tests/src/Simple/SimpleTest.targets
@@ -6,6 +6,7 @@
     <OutputPath>$(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\</OutputPath>
     <IntermediateOutputPath>$(MSBuildProjectDirectory)\obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
     <DebugType Condition="'$(DebugType)' == ''">portable</DebugType>
+    <DefineConstants Condition="$(NativeCodeGen) == 'cpp'">$(DefineConstants);CODEGEN_CPP</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>