From 6cf15f81f3f23bf47e83fa38180c92dc5afd27f1 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Tue, 1 Feb 2022 17:26:53 -0500 Subject: Reenable unit tests on s390x --- debian/changelog | 2 +- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23869523..296446b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ abseil (0~20210324.2-1) UNRELEASED; urgency=medium debian/changelog. * Stop forcing -Wl,--no-as-needed on dependents. (Closes: #1001596) * Compute Thumb function bounds correctly. (Closes: #987314) - * Reenable unit tests on arm64 and mips64el. + * Reenable unit tests on arm64, mips64el, and s390x. -- Benjamin Barenblat Thu, 08 Apr 2021 10:28:01 -0400 diff --git a/debian/control b/debian/control index d0623013..4acf655a 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Maintainer: Benjamin Barenblat Build-Depends: cmake (>= 3.5), debhelper-compat (= 12), - googletest (>= 1.10.0.20200926) [amd64 arm64 mips64el ppc64el], + googletest (>= 1.10.0.20200926) [amd64 arm64 mips64el ppc64el s390x], Rules-Requires-Root: no Standards-Version: 4.5.1 Section: libs diff --git a/debian/rules b/debian/rules index fa8c20e3..f8fc5082 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ include /usr/share/dpkg/architecture.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow reproducible=+fixfilepath # Unit tests aren't working on all platforms yet. -ifneq ($(filter $(DEB_HOST_ARCH),amd64 arm64 mips64el ppc64el),) +ifneq ($(filter $(DEB_HOST_ARCH),amd64 arm64 mips64el ppc64el s390x),) ABSL_RUN_TESTS=ON else ABSL_RUN_TESTS=OFF -- cgit v1.2.3