3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-02-16 19:43:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix escaping of quotes in coverage helper

Browse Source
This commit is contained in:
Martin Hořeňovský 2019-09-21 23:19:45 +02:00
parent fc2066bf18
commit de42f8a93e
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/coverage-helper.cpp
View File

@ -29,7 +29,8 @@ std::string escape_arg(const std::string& arg) {
escaped.append(num_backslashes * 2, '\\'); escaped.append(num_backslashes * 2, '\\');
break; break;
} else if (*it == '"') { } else if (*it == '"') {
escaped.append(num_backslashes * 2 + 1, '\\'); escaped.append((num_backslashes + 1) * 2, '\\');
escaped.push_back('"');
escaped.push_back(*it); escaped.push_back(*it);
} else { } else {
escaped.append(num_backslashes, '\\'); escaped.append(num_backslashes, '\\');
@ -97,7 +98,7 @@ int exec_cmd(std::string const& cmd, int log_num, std::string const& path) {
+ ".bin --quiet " + "--sources " + escape_arg(path) + " --cover_children -- " + cmd; + ".bin --quiet " + "--sources " + escape_arg(path) + " --cover_children -- " + cmd;
std::cout << "=== Marker ===: Cmd: " << real_cmd << '\n'; std::cout << "=== Marker ===: Cmd: " << real_cmd << '\n';
auto pipe = _popen(real_cmd.c_str(), "r"); auto pipe = _popen(real_cmd.c_str(), "r");
if (!pipe) { if (!pipe) {
throw std::runtime_error("popen() failed!"); throw std::runtime_error("popen() failed!");
} }
@ -106,12 +107,12 @@ int exec_cmd(std::string const& cmd, int log_num, std::string const& path) {
std::cout << buffer.data(); std::cout << buffer.data();
} }
} }
auto ret = _pclose(pipe); auto ret = _pclose(pipe);
if (ret == -1) { if (ret == -1) {
throw std::runtime_error("underlying error in pclose()"); throw std::runtime_error("underlying error in pclose()");
} }
return ret; return ret;
} }
@ -127,7 +128,7 @@ int main(int argc, char** argv) {
assert(sep - begin(args) == 2 && "Structure differs from expected!"); assert(sep - begin(args) == 2 && "Structure differs from expected!");
auto num = parse_log_file_arg(args[1]); auto num = parse_log_file_arg(args[1]);
auto cmdline = std::accumulate(++sep, end(args), std::string{}, [] (const std::string& lhs, const std::string& rhs) { auto cmdline = std::accumulate(++sep, end(args), std::string{}, [] (const std::string& lhs, const std::string& rhs) {
return lhs + ' ' + escape_arg(rhs); return lhs + ' ' + escape_arg(rhs);
}); });