averello/Bear-mirror
1
0
Fork 0
mirror of https://github.com/rizsotto/Bear.git synced 2025-12-12 20:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for sccache (#643)

Browse Source 
* support sccache wrapper as ccache variant

* test sccache wrapper queries

* fix: call is_distcc_query in its tests not is_ccache_query
This commit is contained in:
George Rennie
2025-09-26 23:31:26 +01:00
committed by GitHub
parent d75455d6ce
commit 8bf857ffa9
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/citnames/source/semantic/ToolWrapper.cc
View File

@@ -56,7 +56,7 @@ namespace cs::semantic {
bool ToolWrapper::is_ccache_call(const fs::path &program) {
const auto string = program.filename().string();
return string == "ccache";
return string == "ccache" || string == "sccache";
}
bool ToolWrapper::is_ccache_query(const std::list<std::string> &arguments) {

17
source/citnames/test/ToolWrapperTest.cc
View File

@@ -66,14 +66,19 @@ namespace {
EXPECT_FALSE(ToolWrapper::is_ccache_call("/usr/bin/g++"));
EXPECT_TRUE(ToolWrapper::is_ccache_call("ccache"));
EXPECT_TRUE(ToolWrapper::is_ccache_call("sccache"));
}
TEST(ToolWrapper, is_ccache_query) {
EXPECT_TRUE(ToolWrapper::is_ccache_query({"ccache"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"ccache", "-c"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"ccache", "--cleanup"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"sccache"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"sccache", "-s"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"sccache", "-h"}));
EXPECT_FALSE(ToolWrapper::is_ccache_query({"ccache", "cc", "-c"}));
EXPECT_FALSE(ToolWrapper::is_ccache_query({"sccache", "cc", "-c"}));
}
TEST(ToolWrapper, is_distcc_call) {
@@ -90,13 +95,13 @@ namespace {
}
TEST(ToolWrapper, is_distcc_query) {
EXPECT_TRUE(ToolWrapper::is_ccache_query({"distcc"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"distcc", "--help"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"distcc", "--show-hosts"}));
EXPECT_TRUE(ToolWrapper::is_ccache_query({"distcc", "-j"}));
EXPECT_TRUE(ToolWrapper::is_distcc_query({"distcc"}));
EXPECT_TRUE(ToolWrapper::is_distcc_query({"distcc", "--help"}));
EXPECT_TRUE(ToolWrapper::is_distcc_query({"distcc", "--show-hosts"}));
EXPECT_TRUE(ToolWrapper::is_distcc_query({"distcc", "-j"}));
EXPECT_FALSE(ToolWrapper::is_ccache_query({"distcc", "cc", "--help"}));
EXPECT_FALSE(ToolWrapper::is_ccache_query({"distcc", "cc", "-c"}));
EXPECT_FALSE(ToolWrapper::is_distcc_query({"distcc", "cc", "--help"}));
EXPECT_FALSE(ToolWrapper::is_distcc_query({"distcc", "cc", "-c"}));
}
TEST(ToolWrapper, remove_wrapper) {