Skip to content

Commit e6fbfa2

Browse files
authored
[wasm][coreclr] Enable all but pinvoke interpreter tests (#120789)
1 parent ccf1a58 commit e6fbfa2

File tree

1 file changed

+31
-60
lines changed

1 file changed

+31
-60
lines changed

src/tests/JIT/interpreter/Interpreter.cs

Lines changed: 31 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -943,13 +943,9 @@ public static void RunInterpreterTests()
943943
if (!TestCalli())
944944
Environment.FailFast(null);
945945

946-
// active issue https://github.com/dotnet/runtime/issues/120319
947-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
948-
{
949-
Console.WriteLine("TestStaticVirtualGeneric_CodePointerCase");
950-
if (!TestStaticVirtualGeneric_CodePointerCase())
951-
Environment.FailFast(null);
952-
}
946+
Console.WriteLine("TestStaticVirtualGeneric_CodePointerCase");
947+
if (!TestStaticVirtualGeneric_CodePointerCase())
948+
Environment.FailFast(null);
953949

954950
Console.WriteLine("TestPreciseInitCctors");
955951
if (!TestPreciseInitCctors())
@@ -969,11 +965,7 @@ public static void RunInterpreterTests()
969965

970966
Console.WriteLine("Empty string length: {0}", string.Empty.Length);
971967

972-
// active issue https://github.com/dotnet/runtime/issues/120319
973-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
974-
{
975-
Console.WriteLine("BitConverter.IsLittleEndian: {0}", BitConverter.IsLittleEndian);
976-
}
968+
Console.WriteLine("BitConverter.IsLittleEndian: {0}", BitConverter.IsLittleEndian);
977969

978970
Console.WriteLine("IntPtr.Zero: {0}, UIntPtr.Zero: {1}", IntPtr.Zero, UIntPtr.Zero);
979971

@@ -1964,30 +1956,21 @@ public static bool TestVirtual()
19641956
retType = bc.GenericVirtualMethod<int>(out isBase);
19651957
if (retType != typeof(int) || isBase)
19661958
return false;
1967-
// active issue https://github.com/dotnet/runtime/issues/120319
1968-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
1969-
{
1970-
Console.WriteLine("bc.GenericVirtualMethod<string>");
1971-
retType = bc.GenericVirtualMethod<string>(out isBase);
1972-
if (retType != typeof(string) || isBase)
1973-
return false;
1974-
}
1959+
Console.WriteLine("bc.GenericVirtualMethod<string>");
1960+
retType = bc.GenericVirtualMethod<string>(out isBase);
1961+
if (retType != typeof(string) || isBase)
1962+
return false;
19751963
Console.WriteLine("itest.VirtualMethod");
19761964
if (itest.VirtualMethod() != 0xdede)
19771965
return false;
19781966
Console.WriteLine("itest.GenericVirtualMethod<int>");
19791967
retType = itest.GenericVirtualMethod<int>(out isBase);
19801968
if (retType != typeof(int) || isBase)
19811969
return false;
1982-
// active issue https://github.com/dotnet/runtime/issues/120319
1983-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
1984-
{
1985-
Console.WriteLine("itest.GenericVirtualMethod<string>");
1986-
retType = itest.GenericVirtualMethod<string>(out isBase);
1987-
if (retType != typeof(string) || isBase)
1988-
return false;
1989-
}
1990-
1970+
Console.WriteLine("itest.GenericVirtualMethod<string>");
1971+
retType = itest.GenericVirtualMethod<string>(out isBase);
1972+
if (retType != typeof(string) || isBase)
1973+
return false;
19911974
bc = new BaseClass();
19921975
itest = bc;
19931976
Console.WriteLine("bc.NonVirtualMethod");
@@ -2000,29 +1983,21 @@ public static bool TestVirtual()
20001983
retType = bc.GenericVirtualMethod<int>(out isBase);
20011984
if (retType != typeof(int) || !isBase)
20021985
return false;
2003-
// active issue https://github.com/dotnet/runtime/issues/120319
2004-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
2005-
{
2006-
Console.WriteLine("bc.GenericVirtualMethod<string>");
2007-
retType = bc.GenericVirtualMethod<string>(out isBase);
2008-
if (retType != typeof(string) || !isBase)
2009-
return false;
2010-
}
1986+
Console.WriteLine("bc.GenericVirtualMethod<string>");
1987+
retType = bc.GenericVirtualMethod<string>(out isBase);
1988+
if (retType != typeof(string) || !isBase)
1989+
return false;
20111990
Console.WriteLine("itest.VirtualMethod");
20121991
if (itest.VirtualMethod() != 0xbebe)
20131992
return false;
20141993
Console.WriteLine("itest.GenericVirtualMethod<int>");
20151994
retType = itest.GenericVirtualMethod<int>(out isBase);
20161995
if (retType != typeof(int) || !isBase)
20171996
return false;
2018-
// active issue https://github.com/dotnet/runtime/issues/120319
2019-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
2020-
{
2021-
Console.WriteLine("itest.GenericVirtualMethod<string>");
2022-
retType = itest.GenericVirtualMethod<string>(out isBase);
2023-
if (retType != typeof(string) || !isBase)
2024-
return false;
2025-
}
1997+
Console.WriteLine("itest.GenericVirtualMethod<string>");
1998+
retType = itest.GenericVirtualMethod<string>(out isBase);
1999+
if (retType != typeof(string) || !isBase)
2000+
return false;
20262001
return true;
20272002
}
20282003

@@ -2957,24 +2932,20 @@ public unsafe static bool TestCalli()
29572932
return false;
29582933
}
29592934

2960-
2961-
// active issue https://github.com/dotnet/runtime/issues/120319
2962-
if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm)
2935+
GetCalliGeneric<object>()();
2936+
if (_typeFromFill != typeof(object))
29632937
{
2964-
GetCalliGeneric<object>()();
2965-
if (_typeFromFill != typeof(object))
2966-
{
2967-
Console.WriteLine("Calli generic test failed: expected object, got " + _typeFromFill);
2968-
return false;
2969-
}
2938+
Console.WriteLine("Calli generic test failed: expected object, got " + _typeFromFill);
2939+
return false;
2940+
}
29702941

2971-
GetCalliGeneric<string>()();
2972-
if (_typeFromFill != typeof(string))
2973-
{
2974-
Console.WriteLine("Calli generic test failed: expected string, got " + _typeFromFill);
2975-
return false;
2976-
}
2942+
GetCalliGeneric<string>()();
2943+
if (_typeFromFill != typeof(string))
2944+
{
2945+
Console.WriteLine("Calli generic test failed: expected string, got " + _typeFromFill);
2946+
return false;
29772947
}
2948+
29782949
return true;
29792950
}
29802951

0 commit comments

Comments
 (0)