Include package in deps() and rdeps()

nextest-rs · Apr 6, 2022 · 346a485 · 346a485
1 parent dea105b
commit 346a485
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/nextest-filtering/src/compile.rs b/nextest-filtering/src/compile.rs
@@ -43,9 +43,6 @@ fn dependencies_packages(
     for id1 in packages {
         for p2 in all_packages {
             let id2 = p2.id();
-            if id1 == id2 {
-                continue;
-            }
             if cache.depends_on(id1, id2).unwrap_or(false) {
                 set.insert(id2.clone());
             }
@@ -67,9 +64,6 @@ fn rdependencies_packages(
     for id1 in packages {
         for p2 in all_packages {
             let id2 = p2.id();
-            if id1 == id2 {
-                continue;
-            }
             if cache.depends_on(id2, id1).unwrap_or(false) {
                 set.insert(id2.clone());
             }

diff --git a/nextest-filtering/tests/match.rs b/nextest-filtering/tests/match.rs
@@ -74,7 +74,7 @@ fn test_expr_deps() {
     assert!(expr.includes(&mk_pid('a'), "test_something"));
     assert!(expr.includes(&mk_pid('b'), "test_something"));
     assert!(expr.includes(&mk_pid('c'), "test_something"));
-    assert!(!expr.includes(&mk_pid('d'), "test_something"));
+    assert!(expr.includes(&mk_pid('d'), "test_something"));
     assert!(!expr.includes(&mk_pid('e'), "test_something"));
     assert!(!expr.includes(&mk_pid('f'), "test_something"));
     assert!(!expr.includes(&mk_pid('g'), "test_something"));
@@ -89,7 +89,7 @@ fn test_expr_rdeps() {
     assert!(!expr.includes(&mk_pid('a'), "test_something"));
     assert!(!expr.includes(&mk_pid('b'), "test_something"));
     assert!(!expr.includes(&mk_pid('c'), "test_something"));
-    assert!(!expr.includes(&mk_pid('d'), "test_something"));
+    assert!(expr.includes(&mk_pid('d'), "test_something"));
     assert!(expr.includes(&mk_pid('e'), "test_something"));
     assert!(expr.includes(&mk_pid('f'), "test_something"));
     assert!(expr.includes(&mk_pid('g'), "test_something"));

diff --git a/site/src/book/filtering-expression.md b/site/src/book/filtering-expression.md
@@ -14,8 +14,8 @@ Basic sets:
 - `all()`: include everything
 - `test(name-matcher)`: include all tests matching `name-matcher`
 - `package(name-matcher)`: include all tests in packages matching `name-matcher`
-- `deps(name-matcher)`: include all tests in packages depended by packages matching `name-matcher`
-- `rdeps(name-matcher)`: include all tests in packages depending on packages matching `name-matcher`
+- `deps(name-matcher)`: include all tests in packages depended by packages matching `name-matcher` and include all tests in packages matching `name-matcher`
+- `rdeps(name-matcher)`: include all tests in packages depending on packages matching `name-matcher` and include all tests in packages matching `name-matcher`
 - `none()`: include nothing
 
 Name matcher: