From 37b0585febdce8465211b15f2786f22afadfb259 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 9 Oct 2020 18:15:59 +0100
Subject: [PATCH] Use single test, enable runners

---
 .github/workflows/build-and-test.yml          | 32 +++++++-------
 .../Formats/Jpg/Block8x8FTests.cs             | 42 -------------------
 2 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 8fc2dd2bc..0e093a834 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -14,26 +14,26 @@ jobs:
         strategy:
             matrix:
                 options:
-                    # - os: ubuntu-latest
-                    #   framework: netcoreapp3.1
-                    #   runtime: -x64
-                    #   codecov: false
-                    # - os: windows-latest
-                    #   framework: netcoreapp3.1
-                    #   runtime: -x64
-                    #   codecov: true
+                    - os: ubuntu-latest
+                      framework: netcoreapp3.1
+                      runtime: -x64
+                      codecov: false
+                    - os: windows-latest
+                      framework: netcoreapp3.1
+                      runtime: -x64
+                      codecov: true
                     - os: windows-latest
                       framework: netcoreapp2.1
                       runtime: -x64
                       codecov: false
-                    # - os: windows-latest
-                    #   framework: net472
-                    #   runtime: -x64
-                    #   codecov: false
-                    # - os: windows-latest
-                    #   framework: net472
-                    #   runtime: -x86
-                    #   codecov: false
+                    - os: windows-latest
+                      framework: net472
+                      runtime: -x64
+                      codecov: false
+                    - os: windows-latest
+                      framework: net472
+                      runtime: -x86
+                      codecov: false
 
         runs-on: ${{matrix.options.os}}
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
index a09472b46..548238088 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
@@ -5,7 +5,6 @@
 // #define BENCHMARKING
 using System;
 using System.Diagnostics;
-
 using SixLabors.ImageSharp.Formats.Jpeg.Components;
 using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
 using SixLabors.ImageSharp.Tests.TestUtilities;
@@ -162,52 +161,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             // PrintLinearData((Span<int>)mirror);
         }
 
-        [Fact]
-        public void TransposeIntoFallback()
-        {
-            float[] expected = Create8x8FloatData();
-            ReferenceImplementations.Transpose8x8(expected);
-
-            var source = default(Block8x8F);
-            source.LoadFrom(Create8x8FloatData());
-
-            var dest = default(Block8x8F);
-            source.TransposeIntoFallback(ref dest);
-
-            float[] actual = new float[64];
-            dest.ScaledCopyTo(actual);
-
-            Assert.Equal(expected, actual);
-        }
-
-#if SUPPORTS_RUNTIME_INTRINSICS
-        [Fact]
-        public void TransposeIntoAvx()
-        {
-            float[] expected = Create8x8FloatData();
-            ReferenceImplementations.Transpose8x8(expected);
-
-            var source = default(Block8x8F);
-            source.LoadFrom(Create8x8FloatData());
-
-            var dest = default(Block8x8F);
-            source.TransposeIntoAvx(ref dest);
-
-            float[] actual = new float[64];
-            dest.ScaledCopyTo(actual);
-
-            Assert.Equal(expected, actual);
-        }
-#endif
-
         [Fact]
         public void TransposeInto()
         {
             static void RunTest()
             {
-                // Just testing this fails in CI. RemoteExecutor is not working on my machine.
-                Assert.True(false);
-
                 float[] expected = Create8x8FloatData();
                 ReferenceImplementations.Transpose8x8(expected);