From d4cc943f56bec8c4db327bfac18f95a57fb804b5 Mon Sep 17 00:00:00 2001
From: daxpedda <daxpedda@gmail.com>
Date: Tue, 23 Jan 2024 11:03:55 +0100
Subject: [PATCH] Implement `--skip` flag in test runner (#3803)

---
 CHANGELOG.md              |  3 +++
 crates/test/src/rt/mod.rs | 47 +++++++++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 209bf11b6e5..23dc34c37dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@
 * Added support for running tests in shared and service workers with ``wasm_bindgen_test_configure!` `run_in_shared_worker` and `run_in_service_worker`.
   [#3804](https://github.com/rustwasm/wasm-bindgen/pull/3804)
 
+* Accept the `--skip` flag with `wasm-bindgen-test-runner`.
+  [#3803](https://github.com/rustwasm/wasm-bindgen/pull/3803)
+
 ### Changed
 
 * Stabilize `ClipboardEvent`.
diff --git a/crates/test/src/rt/mod.rs b/crates/test/src/rt/mod.rs
index 0235ce82d1d..c1be2904303 100644
--- a/crates/test/src/rt/mod.rs
+++ b/crates/test/src/rt/mod.rs
@@ -130,9 +130,15 @@ struct State {
     /// Include ignored tests.
     include_ignored: Cell<bool>,
 
+    /// Tests to skip.
+    skip: RefCell<Vec<String>>,
+
     /// Counter of the number of tests that have succeeded.
     succeeded: Cell<usize>,
 
+    /// Counter of the number of tests that have been filtered
+    filtered: Cell<usize>,
+
     /// Counter of the number of tests that have been ignored
     ignored: Cell<usize>,
 
@@ -277,7 +283,9 @@ impl Context {
             state: Rc::new(State {
                 filter: Default::default(),
                 include_ignored: Default::default(),
+                skip: Default::default(),
                 failures: Default::default(),
+                filtered: Default::default(),
                 ignored: Default::default(),
                 remaining: Default::default(),
                 running: Default::default(),
@@ -289,20 +297,25 @@ impl Context {
 
     /// Inform this context about runtime arguments passed to the test
     /// harness.
-    ///
-    /// Eventually this will be used to support flags, but for now it's just
-    /// used to support test filters.
     pub fn args(&mut self, args: Vec<JsValue>) {
-        // Here we want to reject all flags like `--foo` or `-f` as we don't
-        // support anything, and also we only support at most one non-flag
-        // argument as a test filter.
-        //
-        // Everything else is rejected.
         let mut filter = self.state.filter.borrow_mut();
-        for arg in args {
+        let mut skip = self.state.skip.borrow_mut();
+
+        let mut args = args.into_iter();
+
+        while let Some(arg) = args.next() {
             let arg = arg.as_string().unwrap();
             if arg == "--include-ignored" {
                 self.state.include_ignored.set(true);
+            } else if arg == "--skip" {
+                skip.push(
+                    args.next()
+                        .expect("Argument to option 'skip' missing")
+                        .as_string()
+                        .unwrap(),
+                );
+            } else if let Some(arg) = arg.strip_prefix("--skip=") {
+                skip.push(arg.to_owned())
             } else if arg.starts_with('-') {
                 panic!("flag {} not supported", arg);
             } else if filter.is_some() {
@@ -482,8 +495,16 @@ impl Context {
         let filter = self.state.filter.borrow();
         if let Some(filter) = &*filter {
             if !name.contains(filter) {
-                let ignored = self.state.ignored.get();
-                self.state.ignored.set(ignored + 1);
+                let filtered = self.state.filtered.get();
+                self.state.filtered.set(filtered + 1);
+                return;
+            }
+        }
+
+        for skip in &*self.state.skip.borrow() {
+            if name.contains(skip) {
+                let filtered = self.state.filtered.get();
+                self.state.filtered.set(filtered + 1);
                 return;
             }
         }
@@ -628,11 +649,13 @@ impl State {
             "test result: {}. \
              {} passed; \
              {} failed; \
-             {} ignored\n",
+             {} ignored; \
+             {} filtered out\n",
             if failures.len() == 0 { "ok" } else { "FAILED" },
             self.succeeded.get(),
             failures.len(),
             self.ignored.get(),
+            self.filtered.get(),
         ));
     }