[cctz] 01/02: Fix concurrent test on 32-bit mips plarforms. (Closes: #881950)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository cctz.

commit 6306734ab222b8dc6c6f78efd3c3f47ba76bdc72
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Nov 19 13:03:19 2017 +0100

    Fix concurrent test on 32-bit mips plarforms. (Closes: #881950)
---
 debian/patches/disable_concurring_test_mips.patch | 25 -----------------------
 debian/patches/fix_concurrent_mips_test.patch     | 19 +++++++++++++++++
 debian/patches/series                             |  2 +-
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/debian/patches/disable_concurring_test_mips.patch b/debian/patches/disable_concurring_test_mips.patch
deleted file mode 100644
index f067131..0000000
--- a/debian/patches/disable_concurring_test_mips.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Disable concurrent test for mips platforms.
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/881951
-Forwarded: https://github.com/google/cctz/issues/63
-Last-Update: 2017-11-17
-
---- cctz-2.1~git~a59b930afc8+dfsg1.orig/src/time_zone_lookup_test.cc
-+++ cctz-2.1~git~a59b930afc8+dfsg1/src/time_zone_lookup_test.cc
-@@ -660,6 +71,8 @@ time_zone LoadZone(const std::string& na
- 
- }  // namespace
- 
-+
-+#if !defined(__mips__)
- TEST(TimeZones, LoadZonesConcurrently) {
-   std::promise<void> ready_promise;
-   std::shared_future<void> ready_future(ready_promise.get_future());
-@@ -700,6 +113,7 @@ TEST(TimeZones, LoadZonesConcurrently) {
-   }
-   EXPECT_LE(failures.size(), max_failures) << testing::PrintToString(failures);
- }
-+#endif
- 
- TEST(TimeZone, NamedTimeZones) {
-   const time_zone utc = utc_time_zone();
diff --git a/debian/patches/fix_concurrent_mips_test.patch b/debian/patches/fix_concurrent_mips_test.patch
new file mode 100644
index 0000000..f797210
--- /dev/null
+++ b/debian/patches/fix_concurrent_mips_test.patch
@@ -0,0 +1,19 @@
+Description: Fix concurrent test for 32-bit mips platforms.
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/881951
+Forwarded: https://github.com/google/cctz/issues/63
+Last-Update: 2017-11-17
+
+Index: cctz/src/time_zone_lookup_test.cc
+===================================================================
+--- cctz.orig/src/time_zone_lookup_test.cc
++++ cctz/src/time_zone_lookup_test.cc
+@@ -678,7 +678,7 @@ TEST(TimeZones, LoadZonesConcurrently) {
+     }
+   };
+ 
+-  const std::size_t n_threads = 256;
++  const std::size_t n_threads = 250;
+   std::vector<std::thread> threads;
+   std::vector<std::set<std::string>> thread_failures(n_threads);
+   for (std::size_t i = 0; i != n_threads; ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index f5d4aea..263a3a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 0001-Compile-shared-lib-and-install-it.patch
 0002-Enable-tests-for-Debian.patch
 use_system_zoneinfo.patch
-disable_concurring_test_mips.patch
+fix_concurrent_mips_test.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cctz.git