commit 81fe96a37ab5e3bbda48a705a2406bd4bcaeae46
author bazel.build machine account <ci.bazel@gmail.com> Wed Jun 19 05:24:24 2024 -0400
committer GitHub <noreply@github.com> Wed Jun 19 09:24:24 2024 +0000
tree 03ee65b267fe208b43b12f2f90f7c3f0919000db
parent a6bf55f500a8dd0faa83a019185fb55427bd2843

[7.3.0] Use the generic term "config file" instead of the product-specific ".blazerc" in error messages. (#22793)

Fixes #22685.

PiperOrigin-RevId: 644377301
Change-Id: I05e7e01f1b4f79c219aa974871efcbc41966966c

Commit
https://github.com/bazelbuild/bazel/commit/7b02eaa837fabf0e3d0e810690e51d55506529ab

Co-authored-by: Googler <tjgq@google.com>

src/test/cpp/rc_options_test.cc

diff --git a/src/test/cpp/rc_options_test.cc b/src/test/cpp/rc_options_test.cc
index c7cec75..0a1bf28 100644
--- a/src/test/cpp/rc_options_test.cc
+++ b/src/test/cpp/rc_options_test.cc
@@ -406,10 +406,11 @@
   EXPECT_EQ(error, RcFile::ParseError::UNREADABLE_FILE);
   ASSERT_THAT(
       error_text,
-      MatchesRegex(kIsWindows
-        ? "Unexpected error reading \\.blazerc file '.*not_a_file\\.bazelrc':.*"
-        : "Unexpected error reading \\.blazerc file '.*not_a_file\\.bazelrc': "
-          "\\(error: 2\\): No such file or directory"));
+      MatchesRegex(kIsWindows ? "Unexpected error reading config file "
+                                "'.*not_a_file\\.bazelrc':.*"
+                              : "Unexpected error reading config file "
+                                "'.*not_a_file\\.bazelrc': "
+                                "\\(error: 2\\): No such file or directory"));
 }
 
 TEST_F(RcOptionsTest, ImportedFileDoesNotExist) {
@@ -422,12 +423,14 @@
       Parse("import_fake_file.bazelrc", &error, &error_text);
   EXPECT_EQ(error, RcFile::ParseError::UNREADABLE_FILE);
   if (kIsWindows) {
-    ASSERT_THAT(error_text, MatchesRegex(
-      "Unexpected error reading \\.blazerc file 'somefile':.*"));
+    ASSERT_THAT(
+        error_text,
+        MatchesRegex("Unexpected error reading config file 'somefile':.*"));
   } else {
-    ASSERT_EQ(error_text,
-      "Unexpected error reading .blazerc file 'somefile': (error: 2): No such "
-      "file or directory");
+    ASSERT_EQ(
+        error_text,
+        "Unexpected error reading config file 'somefile': (error: 2): No such "
+        "file or directory");
   }
 }
 
@@ -449,7 +452,7 @@
   EXPECT_EQ(error, RcFile::ParseError::INVALID_FORMAT);
   ASSERT_THAT(
       error_text,
-      MatchesRegex("Invalid import declaration in .blazerc file "
+      MatchesRegex("Invalid import declaration in config file "
                    "'.*bad_import.bazelrc': 'import somefile bar' \\(are you "
                    "in your source checkout/WORKSPACE\\?\\)"));
 }
@@ -463,7 +466,7 @@
   EXPECT_EQ(error, RcFile::ParseError::INVALID_FORMAT);
   ASSERT_THAT(
       error_text,
-      MatchesRegex("Invalid import declaration in .blazerc file "
+      MatchesRegex("Invalid import declaration in config file "
                    "'.*bad_import.bazelrc': 'try-import somefile bar' \\(are "
                    "you in your source checkout/WORKSPACE\\?\\)"));
 }