Simplify auto_load_expand_dir_vars and remove substitute_path_component

This simplifies auto_load_expand_dir_vars to first split the string,
then do any needed substitutions.  This was suggested by Simon, and is
much simpler than the current approach.

Then this patch also removes substitute_path_component, as it is no
longer called.  This is nice because it helps with the long term goal
of removing utils.h.

Regression tested on x86-64 Fedora 36.

1 files changed, 0 insertions, 60 deletions

diff --git a/gdb/unittests/utils-selftests.c b/gdb/unittests/utils-selftests.c
deleted file mode 100644
index 70609aa..0000000
--- a/gdb/unittests/utils-selftests.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Unit tests for the utils.c file.
-
-   Copyright (C) 2018-2023 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "utils.h"
-#include "gdbsupport/selftest.h"
-
-namespace selftests {
-namespace utils {
-
-static void
-test_substitute_path_component ()
-{
-  auto test = [] (std::string s, const char *from, const char *to,
-		  const char *expected)
-    {
-      char *temp = xstrdup (s.c_str ());
-      substitute_path_component (&temp, from, to);
-      SELF_CHECK (strcmp (temp, expected) == 0);
-      xfree (temp);
-    };
-
-  test ("/abc/$def/g", "abc", "xyz", "/xyz/$def/g");
-  test ("abc/$def/g", "abc", "xyz", "xyz/$def/g");
-  test ("/abc/$def/g", "$def", "xyz", "/abc/xyz/g");
-  test ("/abc/$def/g", "g", "xyz", "/abc/$def/xyz");
-  test ("/abc/$def/g", "ab", "xyz", "/abc/$def/g");
-  test ("/abc/$def/g", "def", "xyz", "/abc/$def/g");
-  test ("/abc/$def/g", "abc", "abc", "/abc/$def/g");
-  test ("/abc/$def/g", "abc", "", "//$def/g");
-  test ("/abc/$def/g", "abc/$def", "xyz", "/xyz/g");
-  test ("/abc/$def/abc", "abc", "xyz", "/xyz/$def/xyz");
-}
-
-}
-}
-
-void _initialize_utils_selftests ();
-void
-_initialize_utils_selftests ()
-{
-  selftests::register_test ("substitute_path_component",
-			    selftests::utils::test_substitute_path_component);
-}