3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-23 11:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Coverage helper now passes-on test return value

Browse Source 
This allows #1684 to proceed forward.
This commit is contained in:
Martin Hořeňovský 2019-07-19 13:56:08 +02:00
parent c424ca47f9
commit 0b42ada60d
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
misc/coverage-helper.cpp
View File

@ -89,27 +89,30 @@ std::string windowsify_path(std::string path) {
return path; return path;
} }
void exec_cmd(std::string const& cmd, int log_num, std::string const& path) { int exec_cmd(std::string const& cmd, int log_num, std::string const& path) {
std::array<char, 128> buffer; std::array<char, 128> buffer;
#if defined(_WIN32)
// cmd has already been escaped outside this function. // cmd has already been escaped outside this function.
auto real_cmd = "OpenCppCoverage --export_type binary:cov-report" + std::to_string(log_num) auto real_cmd = "OpenCppCoverage --export_type binary:cov-report" + std::to_string(log_num)
+ ".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';
std::shared_ptr<FILE> pipe(_popen(real_cmd.c_str(), "r"), _pclose); auto pipe = _popen(real_cmd.c_str(), "r");
#else // Just for testing, in the real world we will always work under WIN32
(void)log_num; (void)path;
std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
#endif
if (!pipe) { if (!pipe) {
throw std::runtime_error("popen() failed!"); throw std::runtime_error("popen() failed!");
} }
while (!feof(pipe.get())) { while (!feof(pipe)) {
if (fgets(buffer.data(), 128, pipe.get()) != nullptr) { if (fgets(buffer.data(), 128, pipe) != nullptr) {
std::cout << buffer.data(); std::cout << buffer.data();
} }
} }
auto ret = _pclose(pipe);
if (ret == -1) {
throw std::runtime_error("underlying error in pclose()");
}
return ret;
} }
// argv should be: // argv should be: