Further simplify test filtering

rustwasm · Dec 20, 2024 · 6dcc913 · 6dcc913
1 parent 95cd15d
commit 6dcc913
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/crates/cli/src/bin/wasm-bindgen-test-runner/main.rs b/crates/cli/src/bin/wasm-bindgen-test-runner/main.rs
@@ -73,14 +73,12 @@ struct Cli {
 impl Cli {
     fn into_args(self, tests: &Tests) -> String {
         let include_ignored = self.include_ignored;
-        let ignored = self.ignored;
         let filtered = tests.filtered;
 
         format!(
             r#"
             // Forward runtime arguments.
             cx.include_ignored({include_ignored:?});
-            cx.ignored({ignored:?});
             cx.filtered_count({filtered});
         "#
         )
@@ -172,9 +170,7 @@ fn main() -> anyhow::Result<()> {
 
     if cli.list {
         for test in tests.tests {
-            if !cli.ignored || test.ignored {
-                println!("{}: test", test.name.split_once("::").unwrap().1);
-            }
+            println!("{}: test", test.name.split_once("::").unwrap().1);
         }
 
         // Returning cleanly has the strange effect of outputting

diff --git a/crates/test/src/rt/mod.rs b/crates/test/src/rt/mod.rs
@@ -130,9 +130,6 @@ struct State {
     /// Include ignored tests.
     include_ignored: Cell<bool>,
 
-    /// Only run ignored tests.
-    ignored: Cell<bool>,
-
     /// Counter of the number of tests that have succeeded.
     succeeded_count: Cell<usize>,
 
@@ -342,7 +339,6 @@ impl Context {
         Context {
             state: Rc::new(State {
                 include_ignored: Default::default(),
-                ignored: Default::default(),
                 failures: Default::default(),
                 succeeded_count: Default::default(),
                 filtered_count: Default::default(),
@@ -360,11 +356,6 @@ impl Context {
         self.state.include_ignored.set(include_ignored);
     }
 
-    /// Handle `--ignored` flag.
-    pub fn ignored(&mut self, ignored: bool) {
-        self.state.ignored.set(ignored);
-    }
-
     /// Handle filter argument.
     pub fn filtered_count(&mut self, filtered: usize) {
         self.state.filtered_count.set(filtered);
@@ -537,14 +528,8 @@ impl Context {
         // This also removes our `__wbgt_` prefix and the `ignored` and `should_panic` modifiers.
         let name = name.split_once("::").unwrap().1;
 
-        if self.state.ignored.get() && ignore.is_none() {
-            let filtered = self.state.filtered_count.get();
-            self.state.filtered_count.set(filtered + 1);
-            return;
-        }
-
-        if !self.state.include_ignored.get() && !self.state.ignored.get() {
-            if let Some(ignore) = ignore {
+        if let Some(ignore) = ignore {
+            if !self.state.include_ignored.get() {
                 self.state
                     .formatter
                     .log_test(name, &TestResult::Ignored(ignore.map(str::to_owned)));