skip two still failing tests on ppc64le

Upstream issue https://github.com/WebAssembly/wabt/issues/1045

.gitignore

@@ -20,3 +20,4 @@
 /wabt-testsuite-9994915.tar.gz
 /wabt-1.0.24.tar.gz
 /wabt-testsuite-01efde8.tar.gz
+/googletest-703bd9c.tar.gz

sources

@@ -1,3 +1,4 @@
 SHA512 (wabt-1.0.24.tar.gz) = 6257702f06baace7eded7fd4890cbf23e533f20ee6c40de82a7a4cd32fe931a49efd3cbfc1355c4da49e6fbd3b62b1cf05edf1699313840d4825a2165a3928a8
 SHA512 (wabt-testsuite-01efde8.tar.gz) = 549c2e13ebbd7d87013426d8cdeaa0a6177928307b688e1b90026e79683f7964f09dfb47294b34ba9190d0f3acb279f6d0a924e1f1a9112fc9d89637b8cb9efd
 SHA512 (wabt-wasm-c-api-d9a8009.tar.gz) = b6ee7d2d83a3ca7b3cb3ee110282f7d32eada1d9020cadd3fdec58f40478879fd9ac9fada526021d8f6e8a26e1df7353df313d4149be2ffe4aea3a28f856fd89
+SHA512 (googletest-703bd9c.tar.gz) = 0b7b9f50efc117de5a6ebfb59006f2bd9da307e546f2cbb8e14e247bfa11b1048b8a361f3aa04f9df78e72e6a43d9051eae4c112fb45b6fd29992ac00e0612e6

wabt-testsuite.patch

@@ -0,0 +1,12 @@
+diff -up wabt-1.0.24/test/run-spec-wasm2c.py.utf8 wabt-1.0.24/test/run-spec-wasm2c.py
+--- wabt-1.0.24/test/run-spec-wasm2c.py.utf8	2021-08-11 22:00:51.000000000 +0200
++++ wabt-1.0.24/test/run-spec-wasm2c.py	2021-08-20 13:47:48.766113890 +0200
+@@ -390,7 +390,7 @@ def main(args):
+ 
+         cc = utils.Executable(options.cc, *options.cflags)
+ 
+-        with open(json_file_path) as json_file:
++        with open(json_file_path, encoding="utf-8") as json_file:
+             spec_json = json.load(json_file)
+ 
+         prefix = ''

wabt.spec

@@ -1,4 +1,4 @@
-%undefine __cmake_in_source_build
+%undefine __cmake3_in_source_build
 %bcond_without check
 %global commit 21279a861fa3dbac9af9d2bab16c741df17a86af
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
@@ -6,6 +6,8 @@
 %global ts_shortcommit %(c=%{ts_commit}; echo ${c:0:7})
 %global wc_commit d9a80099d496b5cdba6f3fe8fc77586e0e505ddc
 %global wc_shortcommit %(c=%{wc_commit}; echo ${c:0:7})
+%global gt_commit 703bd9caab50b139428cea1aaff9974ebee5742e
+%global gt_shortcommit %(c=%{gt_commit}; echo ${c:0:7})
 
 Summary: The WebAssembly Binary Toolkit
 Name: wabt
@@ -15,11 +17,14 @@ URL: https://github.com/WebAssembly/wabt
 Source0: https://github.com/WebAssembly/wabt/archive/%{version}/%{name}-%{version}.tar.gz
 Source1: https://github.com/WebAssembly/testsuite/archive/%{ts_commit}/%{name}-testsuite-%{ts_shortcommit}.tar.gz
 Source2: https://github.com/WebAssembly/wasm-c-api/archive/%{wc_commit}/%{name}-wasm-c-api-%{wc_shortcommit}.tar.gz
+Source3: https://github.com/google/googletest/archive/%{gt_commit}/googletest-%{gt_shortcommit}.tar.gz
+# https://github.com/WebAssembly/wabt/issues/1704
+Patch0: %{name}-testsuite.patch
 License: ASL 2.0
 BuildRequires: cmake3
-BuildRequires: gcc-c++
+# https://github.com/WebAssembly/wabt/issues/1703
+BuildRequires: devtoolset-10-gcc-c++
 %if %{with check}
-BuildRequires: gtest-devel
 BuildRequires: python%{python3_pkgversion}-ply
 %endif
 # wasm.h from https://github.com/WebAssembly/wasm-c-api/ is used for build
@@ -38,40 +43,29 @@ with the spec (e.g. 1:1 round-trips with no changes to instructions).
 %prep
 %setup -q
 %if %{with check}
-rmdir third_party/{testsuite,wasm-c-api}
+%patch0 -p1 -b .utf8
+rmdir third_party/{gtest,testsuite,wasm-c-api}
 tar xzf %{S:1} -C third_party
 mv third_party/testsuite{-%{ts_commit},}
 tar xzf %{S:2} -C third_party
 mv third_party/wasm-c-api{-%{wc_commit},}
+tar xzf %{S:3} -C third_party
+mv third_party/{googletest-%{gt_commit},gtest}
 pushd test
-# https://github.com/WebAssembly/wabt/issues/1365
-%ifarch armv7hl
-rm wasm2c/spec/skip-stack-guard-page.txt
-%endif
-# https://github.com/WebAssembly/wabt/issues/1044
-%ifarch i686
-rm spec/float_misc.txt
-rm spec/simd/simd_f32x4_arith.txt
-rm spec/simd/simd_f32x4_pmin_pmax.txt
-rm spec/simd/simd_f64x2_arith.txt
-rm spec/simd/simd_f64x2_pmin_pmax.txt
-rm wasm2c/spec/conversions.txt
-rm wasm2c/spec/float_literals.txt
-rm wasm2c/spec/float_memory.txt
-rm wasm2c/spec/float_misc.txt
-rm wasm2c/spec/float_exprs.txt
-%endif
 # https://github.com/WebAssembly/wabt/issues/1045
 %ifarch ppc64le
 rm spec/conversions.txt
 rm spec/simd/simd_conversions.txt
 rm wasm2c/spec/conversions.txt
+rm wasm2c/spec/f32.txt
+rm wasm2c/spec/f64.txt
 %endif
 popd
 %endif
 
 %build
-%cmake3 -DUSE_SYSTEM_GTEST=ON
+. /opt/rh/devtoolset-10/enable
+%cmake3 -DUSE_SYSTEM_GTEST=OFF
 %cmake3_build
 
 %install
@@ -117,6 +111,10 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags}
 * Fri Aug 20 2021 Dominik Mierzejewski <rpm@greysector.net> 1.0.24-1
 - update to 1.0.24 (#1993479)
 - enable skipped tests on s390x (fixed upstream)
+- use _cmake3_in_source_build macro on EPEL
+- use bundled gtest
+- use gcc from devtoolset-10
+- fix test/wasm2c/spec/names.txt test with python-3.6
 
 * Fri May 14 2021 Dominik Mierzejewski <rpm@greysector.net> 1.0.23-1
 - update to 1.0.23 (#1934466)
@@ -167,16 +165,11 @@ test/run-tests.py -v --bindir %{_vpath_builddir} --timeout=80 %{?_smp_mflags}
 * Sat Sep 28 2019 Dominik Mierzejewski <rpm@greysector.net> 1.0.12-1
 - update to 1.0.12 (#1755644)
 - drop obsolete patch
-- disable regress/regress-30.txt until fixed for python3
-- fix running test/wasm2c/spec tests under python3
 
 * Thu Sep 12 2019 Dominik Mierzejewski <rpm@greysector.net> 1.0.11-1
 - update to 1.0.11
 - drop obsolete patches
 
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Mon Apr 15 2019 Dominik Mierzejewski <rpm@greysector.net> 1.0.10-2
 - backport some fixes for test failures from upstream git
 - run tests in parallel and double timeout to prevent failures on armv7hl