summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@google.com>2021-01-31 15:25:57 -0500
committerGravatar Benjamin Barenblat <bbaren@google.com>2021-01-31 15:25:57 -0500
commit844007f73d59ddcf90e7be66dfffea30b8698de5 (patch)
treed3906b22bb29ec3fecae9b9eef3c30ff37d100e4
parent1f93c7bc4f508dbc9d3eb2848b8d2b4cd572eb38 (diff)
Re-disable unit tests on non-amd6420200923.2-3
I’m still working to fix unit tests on non-amd64 platforms, but this package needs to migrate. Disable unit tests everywhere they don’t work.
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules18
3 files changed, 17 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index f964b657..fbf84fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-abseil (0~20200923.2-3) UNRELEASED; urgency=medium
+abseil (0~20200923.2-3) unstable; urgency=medium
- * Fix issues discovered by unit tests.
+ * Fix some issues in unit tests.
+ * Re-disable unit tests on most platforms until they’re working
+ everywhere.
- -- Benjamin Barenblat <bbaren@debian.org> Sun, 31 Jan 2021 15:04:03 -0500
+ -- Benjamin Barenblat <bbaren@debian.org> Sun, 31 Jan 2021 15:13:51 -0500
abseil (0~20200923.2-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 2bf190c5..3cfd969c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Maintainer: Benjamin Barenblat <bbaren@debian.org>
Build-Depends:
cmake (>= 3.5),
debhelper-compat (= 12),
- googletest (>= 1.10.0.20200926),
+ googletest (>= 1.10.0.20200926) [amd64],
Rules-Requires-Root: no
Standards-Version: 4.5.0
Section: libs
diff --git a/debian/rules b/debian/rules
index a20f22b8..03e1a00d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,13 +15,11 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow reproducible=+fixfilepath
-# Some of the Abseil tests exhaust virtual memory on our mipsel buildds.
-# TODO(bbaren): Key this off available virtual memory rather than a particular
-# architecture.
-ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),mipsel)
-ABSL_RUN_TESTS=OFF
-else
+# Unit tests aren't working on all platforms yet.
+ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
ABSL_RUN_TESTS=ON
+else
+ABSL_RUN_TESTS=OFF
endif
%:
@@ -33,14 +31,20 @@ override_dh_auto_clean:
override_dh_auto_configure:
dh_auto_configure -Bstatic -- -DCMAKE_CXX_STANDARD=14 -DBUILD_SHARED_LIBS=OFF
- dh_auto_configure -Bshared -- -DCMAKE_CXX_STANDARD=14 -DBUILD_SHARED_LIBS=ON -DABSL_RUN_TESTS=$ABSL_RUN_TESTS -DABSL_USE_GOOGLETEST_HEAD=OFF
+ifeq ($(ABSL_RUN_TESTS),ON)
+ dh_auto_configure -Bshared -- -DCMAKE_CXX_STANDARD=14 -DBUILD_SHARED_LIBS=ON -DABSL_RUN_TESTS=ON -DABSL_USE_GOOGLETEST_HEAD=OFF
+else
+ dh_auto_configure -Bshared -- -DCMAKE_CXX_STANDARD=14 -DBUILD_SHARED_LIBS=ON
+endif
override_dh_auto_build:
dh_auto_build -Bstatic
dh_auto_build -Bshared
+ifeq ($(ABSL_RUN_TESTS),ON)
override_dh_auto_test:
dh_auto_test -Bshared
+endif
override_dh_auto_install:
dh_auto_install -Bstatic