From d13509a9c4614ba409032fa8115f148ee34356e0 Mon Sep 17 00:00:00 2001
From: Nora Widdecke <nora@sequoia-pgp.org>
Date: Fri, 15 Jan 2021 18:19:35 +0100
Subject: openpgp: Ignore tests when benchmarking.

  - The libtest benchmark harness that is automatically added by cargo
    interferes with criterion. Disable it everywhere where there are no
    benchmarks.
  - https://github.com/rust-lang/rust/issues/47241
  - https://bheisler.github.io/criterion.rs/book/faq.html
---
 autocrypt/Cargo.toml       | 3 +++
 buffered-reader/Cargo.toml | 3 +++
 core/Cargo.toml            | 3 +++
 ffi-macros/Cargo.toml      | 1 +
 ffi/Cargo.toml             | 1 +
 guide/Cargo.toml           | 3 +++
 ipc/Cargo.toml             | 3 +++
 net/Cargo.toml             | 3 +++
 openpgp-ffi/Cargo.toml     | 1 +
 openpgp/Cargo.toml         | 3 +++
 sq/Cargo.toml              | 1 +
 sqv/Cargo.toml             | 1 +
 store/Cargo.toml           | 2 ++
 13 files changed, 28 insertions(+)

diff --git a/autocrypt/Cargo.toml b/autocrypt/Cargo.toml
index 9cd7cca3..262ddf94 100644
--- a/autocrypt/Cargo.toml
+++ b/autocrypt/Cargo.toml
@@ -24,6 +24,9 @@ maintenance = { status = "actively-developed" }
 sequoia-openpgp = { path = "../openpgp", version = "1.0.0", default-features = false }
 base64 = ">=0.12"
 
+[lib]
+bench = false
+
 [features]
 default = ["sequoia-openpgp/default"]
 crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
diff --git a/buffered-reader/Cargo.toml b/buffered-reader/Cargo.toml
index fbe360d3..5f9a7aba 100644
--- a/buffered-reader/Cargo.toml
+++ b/buffered-reader/Cargo.toml
@@ -23,6 +23,9 @@ bzip2 = { version = "0.4", optional = true }
 flate2 = { version = "1.0.1", optional = true }
 libc = "0.2.66"
 
+[lib]
+bench = false
+
 [features]
 default = ["compression"]
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 40bd6b7a..336f41bf 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -25,3 +25,6 @@ anyhow = "1.0.18"
 dirs = "2.0"
 tempfile = "3.1"
 thiserror = "1.0.2"
+
+[lib]
+bench = false
diff --git a/ffi-macros/Cargo.toml b/ffi-macros/Cargo.toml
index ca628951..28a0c0d6 100644
--- a/ffi-macros/Cargo.toml
+++ b/ffi-macros/Cargo.toml
@@ -30,3 +30,4 @@ features = ["full"]
 
 [lib]
 proc-macro = true
+bench = false
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
index bd7cc97e..ac04cb8e 100644
--- a/ffi/Cargo.toml
+++ b/ffi/Cargo.toml
@@ -39,6 +39,7 @@ filetime = "0.2"
 
 [lib]
 crate-type = ["cdylib", "staticlib"]
+bench = false
 
 [features]
 default = ["sequoia-openpgp/default", "sequoia-store/default"]
diff --git a/guide/Cargo.toml b/guide/Cargo.toml
index 01b02208..713c6143 100644
--- a/guide/Cargo.toml
+++ b/guide/Cargo.toml
@@ -14,3 +14,6 @@ build = "build.rs"
 [dependencies]
 sequoia-openpgp = { path = "../openpgp", version = "1.0.0" }
 anyhow = "1.0.18"
+
+[lib]
+bench = false
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
index fb9bbecd..2459a2b3 100644
--- a/ipc/Cargo.toml
+++ b/ipc/Cargo.toml
@@ -50,6 +50,9 @@ lalrpop = ">=0.17"
 clap = "2.33"
 quickcheck = { version = "0.9", default-features = false }
 
+[lib]
+bench = false
+
 [features]
 default = ["sequoia-openpgp/default"]
 crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
diff --git a/net/Cargo.toml b/net/Cargo.toml
index 307a65f0..528642e8 100644
--- a/net/Cargo.toml
+++ b/net/Cargo.toml
@@ -41,6 +41,9 @@ zbase32 = "0.1.2"
 rand = { version = "0.7", default-features = false }
 tokio = { version = "0.2.19", features = ["full"] }
 
+[lib]
+bench = false
+
 [features]
 default = ["compression"]
 
diff --git a/openpgp-ffi/Cargo.toml b/openpgp-ffi/Cargo.toml
index 3afc9b18..2dd8b5db 100644
--- a/openpgp-ffi/Cargo.toml
+++ b/openpgp-ffi/Cargo.toml
@@ -34,6 +34,7 @@ filetime = "0.2"
 
 [lib]
 crate-type = ["lib", "cdylib", "staticlib"]
+bench = false
 
 [features]
 default = ["sequoia-openpgp/default"]
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index 6747af09..ff1e57a1 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -78,6 +78,9 @@ compression-bzip2 = ["bzip2", "buffered-reader/compression-bzip2"]
 vendored = ["vendored-nettle"]
 vendored-nettle = ["nettle/vendored"]
 
+[lib]
+bench = false
+
 [[example]]
 name = "pad"
 required-features = ["compression-deflate"]
diff --git a/sq/Cargo.toml b/sq/Cargo.toml
index 1c79f069..8d189457 100644
--- a/sq/Cargo.toml
+++ b/sq/Cargo.toml
@@ -50,6 +50,7 @@ predicates = "1.0.5"
 [[bin]]
 name = "sq"
 path = "src/sq-usage.rs"
+bench = false
 
 [features]
 default = [
diff --git a/sqv/Cargo.toml b/sqv/Cargo.toml
index 08dee6d7..fa9adaa5 100644
--- a/sqv/Cargo.toml
+++ b/sqv/Cargo.toml
@@ -35,6 +35,7 @@ assert_cli = "0.6"
 [[bin]]
 name = "sqv"
 path = "src/sqv-usage.rs"
+bench = false
 
 [features]
 default = ["crypto-nettle"]
diff --git a/store/Cargo.toml b/store/Cargo.toml
index 273cdb31..3ccac87d 100644
--- a/store/Cargo.toml
+++ b/store/Cargo.toml
@@ -56,9 +56,11 @@ capnpc = "0.13"
 [lib]
 name = "sequoia_store"
 path = "src/lib.rs"
+bench = false
 
 [[bin]]
 name = "sequoia-public-key-store"
 path = "src/server.rs"
 doc = false
 required-features = ["background-services"]
+bench = false
-- 
cgit v1.2.3