Skip to content

Commit

Permalink
test: fix test after emscripten removed from io
Browse files Browse the repository at this point in the history
There was a special case where tests were skipped on emscripten.
This is no longer the case, and as a result the patch no longer
applied.

Remove emscripten to get the patch to apply once again.

Signed-off-by: Sean Cross <[email protected]>
  • Loading branch information
xobs committed Jan 28, 2025
1 parent 08c705b commit 9226cc2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions 0004-std-not-for-upstreaming-customize-tests-for-Xous.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6b8975e7371f9c209dad6956b179ca99d874a509 Mon Sep 17 00:00:00 2001
From 84acc1fc34bcbf9b791c820d92075c5b72c5c655 Mon Sep 17 00:00:00 2001
From: Sean Cross <[email protected]>
Date: Sun, 24 Dec 2023 15:15:01 +0800
Subject: [PATCH 4/5] std: (not for upstreaming) customize tests for Xous
Subject: [PATCH 4/4] std: (not for upstreaming) customize tests for Xous

Signed-off-by: Sean Cross <[email protected]>
---
Expand All @@ -13,7 +13,7 @@ Signed-off-by: Sean Cross <[email protected]>
5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/library/std/src/collections/hash/map/tests.rs b/library/std/src/collections/hash/map/tests.rs
index b79ad1c3119..7568db8f59e 100644
index a275488a556..de39d521d36 100644
--- a/library/std/src/collections/hash/map/tests.rs
+++ b/library/std/src/collections/hash/map/tests.rs
@@ -270,11 +270,11 @@ fn test_lots_of_insertions() {
Expand All @@ -31,13 +31,13 @@ index b79ad1c3119..7568db8f59e 100644
for i in 1..count {
assert!(m.insert(i, i).is_none());
diff --git a/library/std/src/io/tests.rs b/library/std/src/io/tests.rs
index 56b71c47dc7..6cf742c9a46 100644
index 226cc6011bc..42d015fd13f 100644
--- a/library/std/src/io/tests.rs
+++ b/library/std/src/io/tests.rs
@@ -360,6 +360,7 @@ fn chain_zero_length_read_is_not_eof() {
@@ -358,6 +358,7 @@ fn chain_zero_length_read_is_not_eof() {
}

#[bench]
#[cfg_attr(target_os = "emscripten", ignore)]
+#[cfg_attr(target_os = "xous", ignore)]
#[cfg_attr(miri, ignore)] // Miri isn't fast...
fn bench_read_to_end(b: &mut test::Bencher) {
Expand Down Expand Up @@ -136,5 +136,5 @@ index e88f2d5e806..ae9b48e4b7e 100644
let new = Instant::now();
assert!(new >= old);
--
2.34.1
2.47.0

2 changes: 1 addition & 1 deletion rust
Submodule rust updated 2348 files

0 comments on commit 9226cc2

Please sign in to comment.