Downgrade abseil-cpp
Also add a test that repeatedly starts a Bazel client and verifies that it reaches the server.
Work towards #22692
Closes #22695.
PiperOrigin-RevId: 642526003
Change-Id: I73250b89a887f5357f74b4fbcb44327d40bf0854
diff --git a/MODULE.bazel b/MODULE.bazel
index b9ce010..e87643d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -32,7 +32,7 @@
bazel_dep(name = "rules_testing", version = "0.6.0")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
-bazel_dep(name = "abseil-cpp", version = "20240116.2")
+bazel_dep(name = "abseil-cpp", version = "20230802.1")
# TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0.
bazel_dep(name = "buildozer", version = "7.1.2")
@@ -65,16 +65,6 @@
],
)
-# Remove the following patch when the following commit is in a release.
-# https://github.com/abseil/abseil-cpp/commit/65a55c2ba891f6d2492477707f4a2e327a0b40dc
-single_version_override(
- module_name = "abseil-cpp",
- patch_strip = 1,
- patches = [
- "//third_party:abseil-cpp-macos-fix.patch",
- ],
-)
-
# The following Bazel modules are not direct dependencies for building Bazel,
# but are required for visibility from DIST_ARCHIVE_REPOS in repositories.bzl
bazel_dep(name = "apple_support", version = "1.8.1")
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index ca1ed09..f2b99c4 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -7,8 +7,8 @@
"https://bcr.bazel.build/modules/abseil-cpp/20220623.1/MODULE.bazel": "73ae41b6818d423a11fd79d95aedef1258f304448193d4db4ff90e5e7a0f076c",
"https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0",
"https://bcr.bazel.build/modules/abseil-cpp/20230802.0/MODULE.bazel": "d253ae36a8bd9ee3c5955384096ccb6baf16a1b1e93e858370da0a3b94f77c16",
- "https://bcr.bazel.build/modules/abseil-cpp/20240116.2/MODULE.bazel": "73939767a4686cd9a520d16af5ab440071ed75cec1a876bf2fcfaf1f71987a16",
- "https://bcr.bazel.build/modules/abseil-cpp/20240116.2/source.json": "750d5e29326fb59cbe61116a7b803c8a1d0a7090a9c8ed89888d188e3c473fc7",
+ "https://bcr.bazel.build/modules/abseil-cpp/20230802.1/MODULE.bazel": "fa92e2eb41a04df73cdabeec37107316f7e5272650f81d6cc096418fe647b915",
+ "https://bcr.bazel.build/modules/abseil-cpp/20230802.1/source.json": "035b6f1911e17340db722bbc9158f830ee6d5dedba4cb3bcb9e25e590808a32c",
"https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
"https://bcr.bazel.build/modules/apple_support/1.8.1/MODULE.bazel": "500f7aa32c008222e360dc9a158c248c2dbaeb3b6246c19e7269981dbd61e29b",
"https://bcr.bazel.build/modules/apple_support/1.8.1/source.json": "6362ffe3728c63ab28daf35c5804931419e076ab0e60c7e0043484016e5a9800",
@@ -294,7 +294,7 @@
"bzlTransitiveDigest": "51/NRg2Yuex/h7TzW+J9jCXlgPIqQcGHnmKEYx6yGuY=",
"usagesDigest": "S0vNSOLxzaSWBw2qFrqtiXI9txwZdU8Tc5Bmz/zBoJA=",
"recordedFileInputs": {
- "@@//MODULE.bazel": "2c56771ce2290e4701c982a8bd9df9e512b0cfa45f2ba3cf0e14457446430eb2",
+ "@@//MODULE.bazel": "0d5c475ec3703472842343207efa159d6c67d6e0de7a3b055223e25298d2f9bc",
"@@//src/test/tools/bzlmod/MODULE.bazel.lock": "4a9cf4d1d48d36a3d6e24a13094b2c32aa20be5a495d4e5b33e43db973250182"
},
"recordedDirentsInputs": {},
@@ -7148,4 +7148,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/py/bazel/bazel_server_mode_test.py b/src/test/py/bazel/bazel_server_mode_test.py
index 2103114..dc1d3a8 100644
--- a/src/test/py/bazel/bazel_server_mode_test.py
+++ b/src/test/py/bazel/bazel_server_mode_test.py
@@ -19,7 +19,7 @@
class BazelServerModeTest(test_base.TestBase):
def testBazelServerMode(self):
- self.ScratchFile('WORKSPACE')
+ self.ScratchFile('MODULE.bazel')
_, stdout, _ = self.RunBazel(['info', 'server_pid'])
pid1 = stdout[0]
@@ -27,6 +27,19 @@
pid2 = stdout[0]
self.assertEqual(pid1, pid2)
+ def testBazelServerModeStressTest(self):
+ self.ScratchFile('MODULE.bazel')
+
+ last_pid = None
+ for _ in range(10):
+ _, stdout, _ = self.RunBazel(
+ ['--ignore_all_rc_files', 'info', 'server_pid']
+ )
+ new_pid = stdout[0]
+ if last_pid is not None:
+ self.assertEqual(last_pid, new_pid)
+ last_pid = new_pid
+
if __name__ == '__main__':
absltest.main()
