From 41d8bfa622c1bf2af1b6ecbc2c3fe16642beeeb0 Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Wed, 19 Apr 2017 14:50:42 +0200
Subject: [PATCH] Bug 1351459 - disable long b64 tests, r=kaie

Differential Revision: https://nss-review.dev.mozaws.net/D292

--HG--
extra : amend_source : ca86e2de76dc7b125e7e853ae2d9ded221dc9e3b
---
 gtests/util_gtest/util_b64_unittest.cc | 8 +++++---
 tests/gtests/gtests.sh                 | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gtests/util_gtest/util_b64_unittest.cc b/gtests/util_gtest/util_b64_unittest.cc
index 5a691fff7b..097fde2e89 100644
--- a/gtests/util_gtest/util_b64_unittest.cc
+++ b/gtests/util_gtest/util_b64_unittest.cc
@@ -68,11 +68,13 @@ TEST_F(B64EncodeDecodeTest, FakeEncDecTest) {
 }
 
 // These takes a while ...
-TEST_F(B64EncodeDecodeTest, LongFakeDecTest1) {
+TEST_F(B64EncodeDecodeTest, DISABLED_LongFakeDecTest1) {
   EXPECT_TRUE(TestFakeDecode(0x66666666));
 }
-TEST_F(B64EncodeDecodeTest, LongFakeEncDecTest1) { TestFakeEncode(0x3fffffff); }
-TEST_F(B64EncodeDecodeTest, LongFakeEncDecTest2) {
+TEST_F(B64EncodeDecodeTest, DISABLED_LongFakeEncDecTest1) {
+  TestFakeEncode(0x3fffffff);
+}
+TEST_F(B64EncodeDecodeTest, DISABLED_LongFakeEncDecTest2) {
   EXPECT_FALSE(TestFakeEncode(0x40000000));
 }
 
diff --git a/tests/gtests/gtests.sh b/tests/gtests/gtests.sh
index 96a06a6451..469953fd4d 100755
--- a/tests/gtests/gtests.sh
+++ b/tests/gtests/gtests.sh
@@ -55,10 +55,9 @@ gtest_start()
     GTESTREPORT="$GTESTDIR/report.xml"
     PARSED_REPORT="$GTESTDIR/report.parsed"
     echo "executing $i"
-    # We disable slow b64 tests because they fail on ppc and armhf (bug 1351459).
     ${BINDIR}/$i "${SOURCE_DIR}/gtests/freebl_gtest/kat/Hash_DRBG.rsp" \
                  -d "$GTESTDIR" --gtest_output=xml:"${GTESTREPORT}" \
-                 --gtest_filter="${GTESTFILTER-*}:-*B64*Long*"
+                                --gtest_filter="${GTESTFILTER-*}"
     html_msg $? 0 "$i run successfully"
     echo "test output dir: ${GTESTREPORT}"
     echo "executing sed to parse the xml report"