From abb5800dd5b05a1b0b3e1c840866389f05548ed5 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Mon, 8 Jun 2020 09:09:21 -0700
Subject: [PATCH 1/2] Ensure std benchmarks get tested.

---
 src/liballoc/Cargo.toml | 1 +
 src/libcore/Cargo.toml  | 1 +
 src/libstd/Cargo.toml   | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml
index d1119f7b7c0a7..914195f015b5a 100644
--- a/src/liballoc/Cargo.toml
+++ b/src/liballoc/Cargo.toml
@@ -25,6 +25,7 @@ path = "../liballoc/tests/lib.rs"
 [[bench]]
 name = "collectionsbenches"
 path = "../liballoc/benches/lib.rs"
+test = true
 
 [[bench]]
 name = "vec_deque_append_bench"
diff --git a/src/libcore/Cargo.toml b/src/libcore/Cargo.toml
index ac07ffb14febd..42c555cafac86 100644
--- a/src/libcore/Cargo.toml
+++ b/src/libcore/Cargo.toml
@@ -19,6 +19,7 @@ path = "../libcore/tests/lib.rs"
 [[bench]]
 name = "corebenches"
 path = "../libcore/benches/lib.rs"
+test = true
 
 [dev-dependencies]
 rand = "0.7"
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 83029a8642097..490afb5a0438f 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -74,3 +74,8 @@ std_detect_dlsym_getauxval = []
 threads = 125
 # Maximum heap size
 heap_size = 0x8000000
+
+[[bench]]
+name = "stdbenches"
+path = "benches/lib.rs"
+test = true

From 5a9ff052b4879e4ef6748c2f85563a7db0548c0b Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Thu, 18 Jun 2020 14:45:19 -0700
Subject: [PATCH 2/2] Disable core benches on wasm (benches not supported).

---
 src/libcore/benches/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libcore/benches/lib.rs b/src/libcore/benches/lib.rs
index 570fc4ab93390..de4ef7949f344 100644
--- a/src/libcore/benches/lib.rs
+++ b/src/libcore/benches/lib.rs
@@ -1,3 +1,5 @@
+// wasm32 does not support benches (no time).
+#![cfg(not(target_arch = "wasm32"))]
 #![feature(flt2dec)]
 #![feature(test)]