Capture console in tests (#497)

* Capture console output in tests using z80dotnet Use console in GenericField tests to report failures * Tidy up test runner * Tidy up tests to use Eval and console output Fix issue with copying data for empty structs which are padded to 1 byte Uncomment generic type parameters tests previously failing due to empty structs padded to 1 byte * Remove ByRef changes accidentally committed * Fix SQ issues * Nullable type fixes
drcjt · Jun 30, 2024 · b356312 · b356312
1 parent 2f5ac68
commit b356312
Show file tree

Hide file tree

Showing 25 changed files with 499 additions and 177 deletions.
diff --git a/ILCompiler/Compiler/CodeGenerators/LocalVariableCodeGenerator.cs b/ILCompiler/Compiler/CodeGenerators/LocalVariableCodeGenerator.cs
@@ -10,7 +10,7 @@ public void GenerateCode(LocalVariableEntry entry, CodeGeneratorContext context)
             var variable = context.LocalVariableTable[entry.LocalNumber];
             var size = variable.ExactSize;
 
-            if (variable.Type.IsSmall())
+            if (variable.Type.IsSmall() || (variable.Type == VarType.Struct && size == 1))
             {
                 CopyHelper.CopySmallFromIXToStack(context.InstructionsBuilder, variable.Type.IsByte() ? 1 : 2, -variable.StackOffset, !variable.Type.IsUnsigned());
             }

diff --git a/ILCompiler/Compiler/Z80AssemblyWriter.cs b/ILCompiler/Compiler/Z80AssemblyWriter.cs
@@ -34,7 +34,7 @@ private ushort GetOrgAddress()
         {
             if (_configuration.IntegrationTests)
             {
-                return 0x0000;
+                return 0x0050;
             }
             return _configuration.TargetArchitecture switch
             {

diff --git a/ILCompiler/TypeSystem/Common/InstantiatedType.cs b/ILCompiler/TypeSystem/Common/InstantiatedType.cs
@@ -107,5 +107,7 @@ public override IEnumerable<FieldDesc> GetFields()
         public override VarType VarType => _typeDef.VarType;
 
         public override string Name => _typeDef.Name;
+
+        public override bool IsValueType => _typeDef.IsValueType;
     }
 }
diff --git a/Tests/Generics/GenericFields/InstanceAssignmentClass.cs b/Tests/Generics/GenericFields/InstanceAssignmentClass.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class InstanceAssignmentClass
     {
@@ -13,18 +15,31 @@ public T Assign(T t)
             }
         }
 
-        public static int RunTests()
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("InstanceAssignmentClass failed at location: ");
+                Console.WriteLine(_counter);
+            }
+        }
+
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().Assign(_int) != _int) return 1;
+            Eval(new Gen<int>().Assign(_int) == _int);
 
             string _string = "string";
-            if (new Gen<string>().Assign(_string) != _string) return 2;
+            Eval(new Gen<string>().Assign(_string) == _string);
 
             var _object = new object();
-            if (new Gen<object>().Assign(_object) != _object) return 3;
+            Eval(new Gen<object>().Assign(_object) == _object);
 
-            return 0;
+            return _result;
         }
     }
 }
diff --git a/Tests/Generics/GenericFields/InstanceAssignmentStruct.cs b/Tests/Generics/GenericFields/InstanceAssignmentStruct.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class InstanceAssignmentStruct
     {
@@ -13,18 +15,31 @@ public T Assign(T t)
             }
         }
 
-        public static int RunTests()
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("InstanceAssignmentStruct failed at location: ");
+                Console.WriteLine(_counter);
+            }
+        }
+
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().Assign(_int) != _int) return 1;
+            Eval(new Gen<int>().Assign(_int) == _int);
 
             string _string = "string";
-            if (new Gen<string>().Assign(_string) != _string) return 2;
+            Eval(new Gen<string>().Assign(_string) == _string);
 
             var _object = new object();
-            if (new Gen<object>().Assign(_object) != _object) return 3;
+            Eval(new Gen<object>().Assign(_object) == _object);
 
-            return 0;
+            return _result;
         }
     }
 }
diff --git a/Tests/Generics/GenericFields/InstanceEqualNullClass.cs b/Tests/Generics/GenericFields/InstanceEqualNullClass.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class InstanceEqualNullClass
     {
@@ -9,24 +11,37 @@ public class Gen<T>
             public bool EqualNull(T? t)
             {
                 Field1 = t;
-                return ((object)Field1! == null);
+                return ((object?)Field1 == null);
+            }
+        }
+
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("InstanceEqualNullClass failed at location: ");
+                Console.WriteLine(_counter);
             }
         }
 
-        public static int RunTests()
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().EqualNull(_int)) return 1;
+            Eval(!new Gen<int>().EqualNull(_int));
 
-            string _string = "string";
-            if (new Gen<string>().EqualNull(_string)) return 2;
-            if (!new Gen<string>().EqualNull(null)) return 3;
+            string _string = "string";                       
+            Eval(!new Gen<string>().EqualNull(_string));
+            Eval(new Gen<string>().EqualNull(null));
 
             var _object = new object();
-            if (new Gen<object>().EqualNull(_object)) return 4;
-            if (!new Gen<object>().EqualNull(null)) return 5;
+            Eval(!new Gen<object>().EqualNull(_object));
+            Eval(new Gen<object>().EqualNull(null));
 
-            return 0;
+            return _result;
         }
     }
 }
diff --git a/Tests/Generics/GenericFields/InstanceEqualNullStruct.cs b/Tests/Generics/GenericFields/InstanceEqualNullStruct.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class InstanceEqualNullStruct
     {
@@ -9,24 +11,37 @@ public struct Gen<T>
             public bool EqualNull(T? t)
             {
                 Field1 = t;
-                return ((object)Field1! == null);
+                return ((object?)Field1 == null);
+            }
+        }
+
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("InstanceEqualNullStruct failed at location: ");
+                Console.WriteLine(_counter);
             }
         }
 
-        public static int RunTests()
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().EqualNull(_int)) return 1;
+            Eval(!new Gen<int>().EqualNull(_int));
 
             string _string = "string";
-            if (new Gen<string>().EqualNull(_string)) return 2;
-            if (!new Gen<string>().EqualNull(null)) return 3;
+            Eval(!new Gen<string>().EqualNull(_string));
+            Eval(new Gen<string>().EqualNull(null));
 
             var _object = new object();
-            if (new Gen<object>().EqualNull(_object)) return 4;
-            if (!new Gen<object>().EqualNull(null)) return 5;
+            Eval(!new Gen<object>().EqualNull(_object));
+            Eval(new Gen<object>().EqualNull(null));
 
-            return 0;
+            return _result;
         }
     }
 }
diff --git a/Tests/Generics/GenericFields/StaticAssignmentClass.cs b/Tests/Generics/GenericFields/StaticAssignmentClass.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class StaticAssignmentClass
     {
@@ -13,18 +15,31 @@ public T Assign(T t)
             }
         }
 
-        public static int RunTests()
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("StaticAssignmentClass failed at location: ");
+                Console.WriteLine(_counter);
+            }
+        }
+
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().Assign(_int) != _int) return 1;
+            Eval(new Gen<int>().Assign(_int) == _int);
 
             string _string = "string";
-            if (new Gen<string>().Assign(_string) != _string) return 2;
+            Eval(new Gen<string>().Assign(_string) == _string);
 
             var _object = new object();
-            if (new Gen<object>().Assign(_object) != _object) return 3;
+            Eval(new Gen<object>().Assign(_object) == _object);
 
-            return 0;
+            return _result;
         }
     }
 }
diff --git a/Tests/Generics/GenericFields/StaticAssignmentStruct.cs b/Tests/Generics/GenericFields/StaticAssignmentStruct.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class StaticAssignmentStruct
     {
@@ -13,18 +15,31 @@ public T Assign(T t)
             }
         }
 
-        public static int RunTests()
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("StaticAssignmentStruct failed at location: ");
+                Console.WriteLine(_counter);
+            }
+        }
+
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().Assign(_int) != _int) return 1;
+            Eval(new Gen<int>().Assign(_int) == _int);
 
             string _string = "string";
-            if (new Gen<string>().Assign(_string) != _string) return 2;
+            Eval(new Gen<string>().Assign(_string) == _string);
 
             var _object = new object();
-            if (new Gen<object>().Assign(_object) != _object) return 3;
+            Eval(new Gen<object>().Assign(_object) == _object);
 
-            return 0;
+            return _result;
         }
     }
 }
diff --git a/Tests/Generics/GenericFields/StaticEqualNullClass.cs b/Tests/Generics/GenericFields/StaticEqualNullClass.cs
@@ -1,4 +1,6 @@
-namespace GenericFields
+using System;
+
+namespace GenericFields
 {
     internal class StaticEqualNullClass
     {
@@ -9,24 +11,37 @@ public class Gen<T>
             public bool EqualNull(T? t)
             {
                 Field1 = t;
-                return ((object)Field1! == null);
+                return ((object?)Field1 == null);
+            }
+        }
+
+        private static int _counter = 0;
+        private static bool _result = true;
+        public static void Eval(bool exp)
+        {
+            _counter++;
+            if (!exp)
+            {
+                _result = exp;
+                Console.Write("StaticEqualNullClass failed at location: ");
+                Console.WriteLine(_counter);
             }
         }
 
-        public static int RunTests()
+        public static bool RunTests()
         {
             int _int = 1;
-            if (new Gen<int>().EqualNull(_int)) return 1;
+            Eval(!new Gen<int>().EqualNull(_int));
 
             string _string = "string";
-            if (new Gen<string>().EqualNull(_string)) return 2;
-            if (!new Gen<string>().EqualNull(null)) return 3;
+            Eval(!new Gen<string>().EqualNull(_string));
+            Eval(new Gen<string>().EqualNull(null));
 
             var _object = new object();
-            if (new Gen<object>().EqualNull(_object)) return 4;
-            if (!new Gen<object>().EqualNull(null)) return 5;
+            Eval(!new Gen<object>().EqualNull(_object));
+            Eval(new Gen<object>().EqualNull(null));
 
-            return 0;
+            return _result;
         }
     }
 }