Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ multistream-select = { version = "0.13.0", default-features = fa
napi = { version = "2.16.17", default-features = false }
napi-build = { version = "2.2.4", default-features = false }
napi-derive = { version = "2.16.13", default-features = false }
nextest-filtering = { version = "0.17.0", default-features = false }
nextest-metadata = { version = "0.12.2", default-features = false }
nextest-filtering = { version = "0.21.0", default-features = false }
nextest-metadata = { version = "0.14.0", default-features = false }
nodejs_package_json = { version = "0.4.4" }
Comment thread
TimDiekmann marked this conversation as resolved.
opentelemetry = { version = "0.30.0", default-features = false }
opentelemetry-appender-tracing = { version = "0.30.1", default-features = false }
Expand Down
13 changes: 10 additions & 3 deletions libs/@local/hashql/compiletest/src/harness/trial/corpus.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use std::thread;

use guppy::graph::PackageGraph;
use nextest_filtering::{CompiledExpr, EvalContext, Filterset, FiltersetKind, ParseContext};
use nextest_filtering::{
CompiledExpr, EvalContext, Filterset, FiltersetKind, KnownGroups, ParseContext,
};

use super::{group::TrialGroup, set::TrialSet};
use crate::harness::test::TestCorpus;
Expand Down Expand Up @@ -42,8 +44,13 @@ impl<'graph> TrialCorpus<'graph> {
pub(crate) fn filter(&mut self, filter: String, graph: &'graph PackageGraph) {
let context = ParseContext::new(graph);

let filterset = Filterset::parse(filter, &context, FiltersetKind::Test)
.expect("should be a valid filterset expression");
let filterset = Filterset::parse(
filter,
&context,
FiltersetKind::Test,
&KnownGroups::Unavailable,
)
.expect("should be a valid filterset expression");

let context = EvalContext {
default_filter: &CompiledExpr::ALL,
Expand Down
2 changes: 2 additions & 0 deletions libs/@local/hashql/compiletest/src/harness/trial/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use hashql_diagnostics::{
use hashql_syntax_jexpr::Parser;
use line_index::LineIndex;
use nextest_filtering::{BinaryQuery, EvalContext, Filterset, TestQuery};
use nextest_metadata::TestCaseName;
use similar_asserts::SimpleDiff;

use self::stats::TrialSection;
Expand Down Expand Up @@ -205,6 +206,7 @@ impl Trial {
let mut test_name = self.namespace.join("::");
test_name.push_str("::");
test_name.push_str(&self.annotations.directive.name);
let test_name = TestCaseName::new(&test_name);

let matches = filterset.matches_test(
&TestQuery {
Expand Down
Loading