From 9ffe6d4b3c6adb438e7942d4fbd4d40088fbb7a4 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 26 Apr 2023 14:26:48 -0400
Subject: [PATCH] Drop slow-test workaround on s390x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These tests don’t take more than a couple of minutes on s390x.
---
 protobuf.spec | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/protobuf.spec b/protobuf.spec
index 25ffb2a..12da5ee 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -325,15 +325,6 @@ find -name '*.java' | xargs sed -ri \
 
 # Backward compatibility symlink
 %mvn_file :protobuf-java:jar: %{name}/%{name}-java %{name}
-
-# This test is incredibly slow on arm
-# https://github.com/google/protobuf/issues/2389
-%ifarch s390x
-mv java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java \
-   java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java.slow
-mv java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java \
-   java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java.slow
-%endif
 %endif
 
 rm -f src/solaris/libstdc++.la
@@ -493,6 +484,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 - Remove unnecessary explicit pkgconfig dependencies
 - Remove an obsolete workaround for failing Java tests
 - Remove conditionals for retired 32-bit ARM architecture
+- Remove a slow-test workaround on s390x
 
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild