once-cell: Patch failing test

diff --git a/src/once-cell/debian/changelog b/src/once-cell/debian/changelog
index 0e78163f1ecd65ba9246606adfb472e6fdbe9717..f64e2d260c1f2493b8674ee87e8d18e9e57b1b03 100644 (file)
--- a/src/once-cell/debian/changelog
+++ b/src/once-cell/debian/changelog
@@ -1,3 +1,10 @@
+rust-once-cell (1.2.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Patch failing reentrant_init test
+  * Package once_cell 1.2.0 from crates.io using debcargo 2.4.1
+
+ -- Nikos Tsipinakis <nikos@tsipinakis.com>  Wed, 08 Jan 2020 13:50:41 +0000
+
 rust-once-cell (1.2.0-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/once-cell/debian/copyright.debcargo.hint b/src/once-cell/debian/copyright.debcargo.hint
index 63ea0293bc1d33dfe0620d9e1f13d6ed72eaabbe..9d313daee75d203ab2173635872c6e6db40fe87c 100644 (file)
--- a/src/once-cell/debian/copyright.debcargo.hint
+++ b/src/once-cell/debian/copyright.debcargo.hint
@@ -14,8 +14,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019 Nikos Tsipinakis <nikos@tsipinakis.com>
+ 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2020 Nikos Tsipinakis <nikos@tsipinakis.com>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/once-cell/debian/patches/fix-reentrant-init-test.patch b/src/once-cell/debian/patches/fix-reentrant-init-test.patch
new file mode 100644 (file)
index 0000000..a29f643
--- /dev/null
+++ b/src/once-cell/debian/patches/fix-reentrant-init-test.patch
@@ -0,0 +1,25 @@
+From ae1a2edf999ddb4b706dbfee04199cae1f19adce Mon Sep 17 00:00:00 2001
+From: Aleksey Kladov <aleksey.kladov@gmail.com>
+Date: Wed, 1 Jan 2020 13:46:45 +0100
+Subject: [PATCH] Paper over unfortunate --all-targets interaction
+
+closes #79
+---
+ examples/reentrant_init_deadlocks.rs | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/examples/reentrant_init_deadlocks.rs b/examples/reentrant_init_deadlocks.rs
+index bad2bc3..af4b5b7 100644
+--- a/examples/reentrant_init_deadlocks.rs
++++ b/examples/reentrant_init_deadlocks.rs
+@@ -5,3 +5,10 @@ fn main() {
+         2
+     });
+ }
++
++/// Dummy test to make it seem hang when compiled as `--test`
++/// See https://github.com/matklad/once_cell/issues/79
++#[test]
++fn dummy_test() {
++    std::thread::sleep(std::time::Duration::from_secs(4));
++}

diff --git a/src/once-cell/debian/patches/series b/src/once-cell/debian/patches/series
new file mode 100644 (file)
index 0000000..224593f
--- /dev/null
+++ b/src/once-cell/debian/patches/series
@@ -0,0 +1 @@
+fix-reentrant-init-test.patch