diff --git a/Makefile b/Makefile index 8d2165e08f..8020f4db5f 100644 --- a/Makefile +++ b/Makefile @@ -2450,7 +2450,7 @@ BUILD_SIG_NONBUILD_GOALS := \ clean-ext-libraries-bin \ format format-auto check-format check-buck-targets check-headers \ check-sources check-workflow-yaml check-progress clang-tidy \ - tags tags0 package jclean checkout_folly \ + tags tags0 package jclean checkout_folly build_folly \ watch-log dump-log suggest-slow-tests list_all_tests gen-pc \ gen_parallel_tests check-c-api-gen \ setup-hooks install-hooks uninstall-hooks uninstall db_crashtest_tests diff --git a/tools/ldb_test.py b/tools/ldb_test.py index d357e65812..8a40145eaf 100644 --- a/tools/ldb_test.py +++ b/tools/ldb_test.py @@ -787,7 +787,7 @@ class LDBTestCase(unittest.TestCase): # the appearance of an "00xxx.sst" pattern. sstLines = re.findall(r".*\d+.sst.*", data) for line in sstLines: - sstFilename = re.findall(r"\d+.sst", line)[0] + sstFilename = re.findall(r"\d+\.sst", line)[0] sstLevel = re.findall(r"(?<=level )\d+", line)[0] cf = re.findall(r"(?<=column family \')\w+(?=\')", line)[0] testMap[sstFilename] = [sstLevel, cf] diff --git a/util/rate_limiter_test.cc b/util/rate_limiter_test.cc index 2ccec302eb..b379cb701c 100644 --- a/util/rate_limiter_test.cc +++ b/util/rate_limiter_test.cc @@ -410,6 +410,10 @@ TEST_F(RateLimiterTest, Rate) { true; #elif defined(OS_MACOSX) getenv("CIRCLECI") || getenv("GITHUB_ACTIONS"); +#elif defined(__aarch64__) || defined(__arm__) + // Unlike x86_64, the small/loaded ARM CI runners can't reliably sustain + // the target rate, so also exempt GitHub Actions here. + getenv("SANDCASTLE") || getenv("GITHUB_ACTIONS"); #else getenv("SANDCASTLE"); #endif