[nextest-filtering] glob matcher and binary id predicates

Cargo.toml

@@ -11,6 +11,8 @@ members = [
 ]
 
 [workspace.dependencies]
+globset = "0.4.14"
+nextest-metadata = { path = "nextest-metadata" }
 nextest-workspace-hack = "0.1.0"
 
 # make backtrace + color-eyre faster on debug builds

integration-tests/tests/integration/fixtures.rs

@@ -69,7 +69,7 @@ pub static EXPECTED_LIST: Lazy<Vec<TestInfo>> = Lazy::new(|| {
             ],
         ),
         TestInfo::new(
-            "nextest-derive::proc-macro/nextest-derive",
+            "nextest-derive",
             BuildPlatform::Host,
             vec![("it_works", false)],
         ),
@@ -419,7 +419,7 @@ pub fn check_run_output(stderr: &[u8], relocated: bool) {
         (true, "nextest-tests::other other_test_success"),
         (true, "nextest-tests::basic test_success"),
         (false, "nextest-tests::segfault test_segfault"),
-        (true, "nextest-derive::proc-macro/nextest-derive it_works"),
+        (true, "nextest-derive it_works"),
         (
             true,
             "nextest-tests::example/other tests::other_example_success",

integration-tests/tests/integration/snapshots/integration__show_config_test_groups-2.snap

@@ -12,7 +12,7 @@ group: @global
           tests::test_multiply_two_cdylib
       cdylib-link:
           test_multiply_two
-      nextest-derive::proc-macro/nextest-derive:
+      nextest-derive:
           it_works
       nextest-tests:
           tests::call_dylib_add_two
@@ -46,4 +46,3 @@ group: @global
           tests::example_success
       nextest-tests::example/other:
           tests::other_example_success
-

integration-tests/tests/integration/snapshots/integration__show_config_test_groups-4.snap

@@ -15,7 +15,7 @@ group: @global
           tests::test_multiply_two_cdylib
       cdylib-link:
           test_multiply_two
-      nextest-derive::proc-macro/nextest-derive:
+      nextest-derive:
           it_works
       nextest-tests:
           tests::call_dylib_add_two
@@ -47,4 +47,3 @@ group: @global
           tests::example_success
       nextest-tests::example/other:
           tests::other_example_success
-

integration-tests/tests/integration/snapshots/integration__show_config_test_groups-6.snap

@@ -14,7 +14,7 @@ group: @global
           tests::test_multiply_two_cdylib
       cdylib-link:
           test_multiply_two
-      nextest-derive::proc-macro/nextest-derive:
+      nextest-derive:
           it_works
       nextest-tests:
           tests::call_dylib_add_two
@@ -48,4 +48,3 @@ group: @global
           tests::example_success
       nextest-tests::example/other:
           tests::other_example_success
-

nextest-filtering/Cargo.toml

@@ -26,6 +26,7 @@ internal-testing = ["dep:proptest", "dep:test-strategy", "dep:twox-hash"]
 # trace = ["nom-tracable/trace"]
 
 [dependencies]
+globset.workspace = true
 guppy = "0.17.3"
 miette = "5.10.0"
 nom = "7.1.3"
@@ -35,6 +36,7 @@ recursion = "0.5.1"
 regex = "1.10.2"
 regex-syntax = "0.8.2"
 thiserror = "1.0.50"
+nextest-metadata.workspace = true
 proptest = { version = "1.4.0", optional = true }
 test-strategy = { version = "0.3.1", optional = true }
 twox-hash = { version = "1.6.3", optional = true }

nextest-filtering/src/compile.rs

@@ -109,6 +109,7 @@ fn compile_set_def(
         )),
         SetDef::Kind(matcher, span) => FilteringSet::Kind(matcher.clone(), *span),
         SetDef::Binary(matcher, span) => FilteringSet::Binary(matcher.clone(), *span),
+        SetDef::BinaryId(matcher, span) => FilteringSet::BinaryId(matcher.clone(), *span),
         SetDef::Platform(platform, span) => FilteringSet::Platform(*platform, *span),
         SetDef::Test(matcher, span) => FilteringSet::Test(matcher.clone(), *span),
         SetDef::All => FilteringSet::All,

nextest-filtering/src/errors.rs

@@ -41,6 +41,17 @@ pub enum ParseSingleError {
         message: String,
     },
 
+    /// An invalid glob pattern was encountered.
+    #[error("invalid glob")]
+    InvalidGlob {
+        /// The part of the input that failed.
+        #[label("{}", error)]
+        span: SourceSpan,
+
+        /// The underlying error.
+        error: GlobConstructError,
+    },
+
     /// An invalid regex was encountered but we couldn't determine a better error message.
     #[error("invalid regex")]
     InvalidRegexWithoutMessage(#[label("invalid regex")] SourceSpan),
@@ -123,6 +134,15 @@ impl ParseSingleError {
     }
 }
 
+#[derive(Clone, Debug, Error, PartialEq, Eq)]
+pub enum GlobConstructError {
+    #[error("{}", .0.kind())]
+    InvalidGlob(globset::Error),
+
+    #[error("{}", .0)]
+    RegexError(String),
+}
+
 #[derive(Debug, Clone)]
 pub(crate) struct State<'a> {
     // A `RefCell` is required here because the state must implement `Clone` to work with nom.

nextest-filtering/src/expression.rs

@@ -4,14 +4,16 @@
 use crate::{
     errors::{FilterExpressionParseErrors, ParseSingleError, State},
     parsing::{
-        parse, DisplayParsedRegex, DisplayParsedString, ExprResult, ParsedExpr, SetDef, Span,
+        parse, DisplayParsedRegex, DisplayParsedString, ExprResult, GenericGlob, ParsedExpr,
+        SetDef, Span,
     },
 };
 use guppy::{
     graph::{cargo::BuildPlatform, PackageGraph},
     PackageId,
 };
 use miette::SourceSpan;
+use nextest_metadata::{RustBinaryId, RustTestBinaryKind};
 use recursion::{Collapsible, CollapsibleExt, MappableFrame, PartiallyApplied};
 use std::{cell::RefCell, collections::HashSet, fmt};
 
@@ -24,6 +26,8 @@
     Equal { value: String, implicit: bool },
     /// Simple contains test
     Contains { value: String, implicit: bool },
+    /// Test against a glob
+    Glob { glob: GenericGlob, implicit: bool },
     /// Test against a regex
     Regex(regex::Regex),
 }
@@ -68,6 +72,9 @@
                 },
             ) => s1 == s2 && default1 == default2,
             (Self::Regex(r1), Self::Regex(r2)) => r1.as_str() == r2.as_str(),
+            (Self::Glob { glob: g1, .. }, Self::Glob { glob: g2, .. }) => {
+                g1.regex().as_str() == g2.regex().as_str()
+            }
             _ => false,
         }
     }
@@ -90,6 +97,12 @@
                 if *implicit { "" } else { "~" },
                 DisplayParsedString(value)
             ),
+            Self::Glob { glob, implicit } => write!(
+                f,
+                "{}{}",
+                if *implicit { "" } else { "#" },
+                DisplayParsedString(glob.as_str())
+            ),
             Self::Regex(r) => write!(f, "/{}/", DisplayParsedRegex(r)),
         }
     }
@@ -106,6 +119,8 @@
     Platform(BuildPlatform, SourceSpan),
     /// All binaries matching a name
     Binary(NameMatcher, SourceSpan),
+    /// All binary IDs matching a name
+    BinaryId(NameMatcher, SourceSpan),
     /// All tests matching a name
     Test(NameMatcher, SourceSpan),
     /// All tests
@@ -120,11 +135,14 @@
     /// The package ID.
     pub package_id: &'a PackageId,
 
+    /// The binary ID.
+    pub binary_id: &'a RustBinaryId,
+
     /// The name of the binary.
     pub binary_name: &'a str,
 
     /// The kind of binary this test is (lib, test etc).
-    pub kind: &'a str,
+    pub kind: &'a RustTestBinaryKind,
 
     /// The platform this test is built for.
     pub platform: BuildPlatform,
@@ -172,6 +190,7 @@
         match self {
             Self::Equal { value, .. } => value == input,
             Self::Contains { value, .. } => input.contains(value),
+            Self::Glob { glob, .. } => glob.is_match(input),
             Self::Regex(reg) => reg.is_match(input),
         }
     }
@@ -184,8 +203,9 @@
             Self::None => false,
             Self::Test(matcher, _) => matcher.is_match(query.test_name),
             Self::Binary(matcher, _) => matcher.is_match(query.binary_query.binary_name),
+            Self::BinaryId(matcher, _) => matcher.is_match(query.binary_query.binary_id.as_str()),
             Self::Platform(platform, _) => query.binary_query.platform == *platform,
-            Self::Kind(matcher, _) => matcher.is_match(query.binary_query.kind),
+            Self::Kind(matcher, _) => matcher.is_match(query.binary_query.kind.as_str()),
             Self::Packages(packages) => packages.contains(query.binary_query.package_id),
         }
     }
@@ -196,8 +216,9 @@
             Self::None => Logic::bottom(),
             Self::Test(_, _) => None,
             Self::Binary(matcher, _) => Some(matcher.is_match(query.binary_name)),
+            Self::BinaryId(matcher, _) => Some(matcher.is_match(query.binary_id.as_str())),
             Self::Platform(platform, _) => Some(query.platform == *platform),
-            Self::Kind(matcher, _) => Some(matcher.is_match(query.kind)),
+            Self::Kind(matcher, _) => Some(matcher.is_match(query.kind.as_str())),
             Self::Packages(packages) => Some(packages.contains(query.package_id)),
         }
     }