From 9ca2f898316650894e57c0898c386abfb22891d5 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 16 Sep 2016 15:47:04 +0200
Subject: [PATCH] Improve test output

---
 test/testpaint/intercept.c     |  5 +++++
 test/testpaint/intercept_2.cpp | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/testpaint/intercept.c b/test/testpaint/intercept.c
index 58b4cfc50f..d57f1524df 100644
--- a/test/testpaint/intercept.c
+++ b/test/testpaint/intercept.c
@@ -249,6 +249,7 @@ bool metal_b_supports_paint_setup(int supportType, uint8 segment, int special, i
 enum {
 	SPRITEGROUP_NONE,
 
+	SPRITEGROUP_FENCE_METAL_A, // 14568
 	SPRITEGROUP_FENCE_METAL_B, // 14990
 	SPRITEGROUP_FLOOR_CORK, // 22134
 	SPRITEGROUP_FENCE_ROPE, // 22138
@@ -256,6 +257,10 @@ enum {
 };
 
 static int getSpriteGroup(uint16 spriteIndex) {
+	if (spriteIndex >= 14568 && spriteIndex <= 14571) {
+		return SPRITEGROUP_FENCE_METAL_A;
+	}
+
 	if (spriteIndex >= 14990 && spriteIndex <= 14993) {
 		return SPRITEGROUP_FENCE_METAL_B;
 	}
diff --git a/test/testpaint/intercept_2.cpp b/test/testpaint/intercept_2.cpp
index 41685b05de..e4beb20bc4 100644
--- a/test/testpaint/intercept_2.cpp
+++ b/test/testpaint/intercept_2.cpp
@@ -587,17 +587,17 @@ namespace Intercept2
                 }
             }
 
-            if (!tunnelCallsLineUp(newTileTunnelCalls)) {
-                printf("Decompiled tunnel calls don\'t line up. [trackSequence:%d].\n", trackSequence);
-                printTunnelCalls(newTileTunnelCalls);
-                return false;
-            }
-
 
             if (!tunnelCallsLineUp(tileTunnelCalls)) {
                 printf("Original tunnel calls don\'t line up. Skipping tunnel validation [trackSequence:%d].\n",
                        trackSequence);
                 printTunnelCalls(tileTunnelCalls);
+
+                if (!tunnelCallsLineUp(newTileTunnelCalls)) {
+                    printf("Decompiled tunnel calls don\'t line up. [trackSequence:%d].\n", trackSequence);
+                    printTunnelCalls(newTileTunnelCalls);
+                    return false;
+                }
                 continue;
             }