From b259a318223370881d5244cc38ff8a7be58e2a3e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 3 Dec 2023 13:47:42 +0200
Subject: Reimplement search_existing() functions via target_type::search

This allows us to automatically get the target type-specific behavior
with regards to the out_only semantics (added in the previous commit)
instead of passing it explicitly from each call site.
---
 libbuild2/test/common.cxx        | 6 ++----
 libbuild2/test/rule.cxx          | 2 +-
 libbuild2/test/script/script.cxx | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'libbuild2/test')

diff --git a/libbuild2/test/common.cxx b/libbuild2/test/common.cxx
index 7fdb347..89f3dd6 100644
--- a/libbuild2/test/common.cxx
+++ b/libbuild2/test/common.cxx
@@ -150,8 +150,7 @@ namespace build2
               t.name == n->value &&                   // Name matches.
               tt.name == n->type &&                   // Target type matches.
               d == n->dir        &&                   // Directory matches.
-              (search_existing (*n, *root_)    == &t ||
-               search_existing (*n, *root_, d) == &t);
+              search_existing (*n, *root_) == &t;
 
           if (r)
             break;
@@ -198,8 +197,7 @@ namespace build2
                 t.name == n->value &&
                 tt.name == n->type &&
                 d == n->dir        &&
-                (search_existing (*n, *root_)    == &t ||
-                 search_existing (*n, *root_, d) == &t);
+                search_existing (*n, *root_) == &t;
 
             if (!r)
               continue; // Not our target.
diff --git a/libbuild2/test/rule.cxx b/libbuild2/test/rule.cxx
index 81bf50a..28eb35b 100644
--- a/libbuild2/test/rule.cxx
+++ b/libbuild2/test/rule.cxx
@@ -1161,7 +1161,7 @@ namespace build2
             fail << "invalid test executable override: '" << *n << "'";
           else
           {
-            // Must be a target name.
+            // Must be a target name. Could be from src (e.g., a script).
             //
             // @@ OUT: what if this is a @-qualified pair of names?
             //
diff --git a/libbuild2/test/script/script.cxx b/libbuild2/test/script/script.cxx
index 05dc7b0..f7827f6 100644
--- a/libbuild2/test/script/script.cxx
+++ b/libbuild2/test/script/script.cxx
@@ -268,7 +268,7 @@ namespace build2
               v = path (n->dir);
             else
             {
-              // Must be a target name.
+              // Must be a target name. Could be from src (e.g., a script).
               //
               // @@ OUT: what if this is a @-qualified pair of names?
               //
-- 
cgit v1.1