From 54124a59f87a2a70751069697523913cd9e6481a Mon Sep 17 00:00:00 2001 From: "Tuan M. Hoang" Date: Sat, 10 Feb 2018 07:02:57 +0000 Subject: testing/cpputest: patch test on s390x --- testing/cpputest/APKBUILD | 9 +++++---- testing/cpputest/test-s390x.patch | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 testing/cpputest/test-s390x.patch diff --git a/testing/cpputest/APKBUILD b/testing/cpputest/APKBUILD index dea7ee6ed8b..2b5253d8bc9 100644 --- a/testing/cpputest/APKBUILD +++ b/testing/cpputest/APKBUILD @@ -10,7 +10,9 @@ license="BSD" options="!dbg" makedepends="cmake" subpackages="$pkgname-doc" -source="https://github.com/cpputest/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/cpputest/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz + test-s390x.patch + " builddir="$srcdir/$pkgname-$pkgver" build() { @@ -40,6 +42,5 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="e8fdbbb5dd37d32d65919f240f984905 cpputest-3.8.tar.gz" -sha256sums="c81dccc5a1bfc7fc6511590c0a61def5f78e3fb19cb8e1f889d8d3395a476456 cpputest-3.8.tar.gz" -sha512sums="a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac cpputest-3.8.tar.gz" +sha512sums="a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac cpputest-3.8.tar.gz +dd1366d9d692c74d1581590992f1ce927a566f9bdcf520d3097330d986d5b9c32b26cac1a2672a3eab4856350117a1e3af05e2ff4122aa11ae21434b0822d978 test-s390x.patch" diff --git a/testing/cpputest/test-s390x.patch b/testing/cpputest/test-s390x.patch new file mode 100644 index 00000000000..13175112630 --- /dev/null +++ b/testing/cpputest/test-s390x.patch @@ -0,0 +1,17 @@ +ref https://github.com/cpputest/cpputest/issues/1004 + +diff --git a/tests/CppUTestExt/MockSupport_cTest.cpp b/tests/CppUTestExt/MockSupport_cTest.cpp +index 8fc55ec..5188857 100644 +--- a/tests/CppUTestExt/MockSupport_cTest.cpp ++++ b/tests/CppUTestExt/MockSupport_cTest.cpp +@@ -186,8 +186,8 @@ TEST(MockSupport_c, outputParameters_differentType) + + TEST(MockSupport_c, outputParametersOfType) + { +- long param = 1; +- const long retval = 2; ++ int param = 1; ++ const int retval = 2; + mock_c()->installCopier("typeName", typeCopy); + mock_c()->expectOneCall("foo")->withOutputParameterOfTypeReturning("typeName", "out", &retval); + mock_c()->actualCall("foo")->withOutputParameterOfType("typeName", "out", ¶m); -- cgit v1.2.3