mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
* Improve C++ test infrastructure and disable hanging test This commit improves the C++ test infrastructure to ensure test output is visible in CI logs, and disables a test that hangs on free-threaded Python 3.14+. Changes: ## CI/test infrastructure improvements - .github/workflows: Added `timeout-minutes: 3` to all C++ test steps to prevent indefinite hangs. - tests/**/CMakeLists.txt: Added `USES_TERMINAL` to C++ test targets (cpptest, test_cross_module_rtti, test_pure_cpp) to ensure output is shown immediately rather than buffered and possibly lost on crash/timeout. - tests/test_with_catch/catch.cpp: Added a custom Catch2 progress reporter with timestamps, Python version info, and a SIGTERM handler to make test execution and failures clearly visible in CI logs. ## Disabled hanging test - The "Move Subinterpreter" test is disabled on free-threaded Python 3.14+ due to a hang in Py_EndInterpreter() when the subinterpreter is destroyed from a different thread than it was created on. Work on fixing the underlying issue will continue under PR #5940. Context: We were in the dark for months (since we started testing with Python 3.14t) because CI logs gave no clue about the root cause of hangs. This led to ignoring intermittent hangs (mostly on macOS). Our hand was forced only with the Python 3.14.1 release, when hangs became predictable on all platforms. For the full development history of these changes, see PR #5933. * Add test summary to progress reporter Print the total number of test cases and assertions at the end of the test run, making it easy to spot if tests are disabled or added. Example output: [ PASSED ] 20 test cases, 1589 assertions. * Add PYBIND11_CATCH2_SKIP_IF macro to skip tests at runtime Catch2 v2 doesn't have native skip support (v3 does with SKIP()). This macro allows tests to be skipped with a visible message while still appearing in the test list. Use this for the Move Subinterpreter test on free-threaded Python 3.14+ so it shows as skipped rather than being conditionally compiled out. Example output: [ RUN ] Move Subinterpreter [ SKIPPED ] Skipped on free-threaded Python 3.14+ (see PR #5940) [ OK ] Move Subinterpreter * Fix clang-tidy bugprone-macro-parentheses warning in PYBIND11_CATCH2_SKIP_IF
176 lines
5.2 KiB
C++
176 lines
5.2 KiB
C++
// The Catch implementation is compiled here. This is a standalone
|
|
// translation unit to avoid recompiling it for every test change.
|
|
|
|
#include <pybind11/embed.h>
|
|
|
|
#include <chrono>
|
|
#include <csignal>
|
|
#include <cstring>
|
|
#include <ctime>
|
|
#include <iomanip>
|
|
#include <sstream>
|
|
|
|
#ifndef _WIN32
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to
|
|
// catch 2.0.1; this should be fixed in the next catch release after 2.0.1).
|
|
PYBIND11_WARNING_DISABLE_MSVC(4996)
|
|
|
|
// Catch uses _ internally, which breaks gettext style defines
|
|
#ifdef _
|
|
# undef _
|
|
#endif
|
|
|
|
#define CATCH_CONFIG_RUNNER
|
|
#define CATCH_CONFIG_DEFAULT_REPORTER "progress"
|
|
#include "catch_skip.h"
|
|
|
|
#include <catch.hpp>
|
|
|
|
namespace py = pybind11;
|
|
|
|
// Simple progress reporter that prints a line per test case.
|
|
namespace {
|
|
|
|
class ProgressReporter : public Catch::StreamingReporterBase<ProgressReporter> {
|
|
public:
|
|
using StreamingReporterBase<ProgressReporter>::StreamingReporterBase;
|
|
|
|
static std::string getDescription() { return "Simple progress reporter (one line per test)"; }
|
|
|
|
void testCaseStarting(Catch::TestCaseInfo const &testInfo) override {
|
|
print_python_version_once();
|
|
auto &os = Catch::cout();
|
|
os << "[ RUN ] " << testInfo.name << '\n';
|
|
os.flush();
|
|
}
|
|
|
|
void testCaseEnded(Catch::TestCaseStats const &stats) override {
|
|
bool failed = stats.totals.assertions.failed > 0;
|
|
auto &os = Catch::cout();
|
|
os << (failed ? "[ FAILED ] " : "[ OK ] ") << stats.testInfo.name << '\n';
|
|
os.flush();
|
|
}
|
|
|
|
void noMatchingTestCases(std::string const &spec) override {
|
|
auto &os = Catch::cout();
|
|
os << "[ NO TEST ] no matching test cases for spec: " << spec << '\n';
|
|
os.flush();
|
|
}
|
|
|
|
void reportInvalidArguments(std::string const &arg) override {
|
|
auto &os = Catch::cout();
|
|
os << "[ ERROR ] invalid Catch2 arguments: " << arg << '\n';
|
|
os.flush();
|
|
}
|
|
|
|
void assertionStarting(Catch::AssertionInfo const &) override {}
|
|
|
|
bool assertionEnded(Catch::AssertionStats const &) override { return false; }
|
|
|
|
void testRunEnded(Catch::TestRunStats const &stats) override {
|
|
auto &os = Catch::cout();
|
|
auto passed = stats.totals.testCases.passed;
|
|
auto failed = stats.totals.testCases.failed;
|
|
auto total = passed + failed;
|
|
auto assertions = stats.totals.assertions.passed + stats.totals.assertions.failed;
|
|
if (failed == 0) {
|
|
os << "[ PASSED ] " << total << " test cases, " << assertions << " assertions.\n";
|
|
} else {
|
|
os << "[ FAILED ] " << failed << " of " << total << " test cases, " << assertions
|
|
<< " assertions.\n";
|
|
}
|
|
os.flush();
|
|
}
|
|
|
|
private:
|
|
void print_python_version_once() {
|
|
if (printed_) {
|
|
return;
|
|
}
|
|
printed_ = true;
|
|
auto &os = Catch::cout();
|
|
os << "[ PYTHON ] " << Py_GetVersion() << '\n';
|
|
os.flush();
|
|
}
|
|
|
|
bool printed_ = false;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
CATCH_REGISTER_REPORTER("progress", ProgressReporter)
|
|
|
|
namespace {
|
|
|
|
std::string get_utc_timestamp() {
|
|
auto now = std::chrono::system_clock::now();
|
|
auto time_t_now = std::chrono::system_clock::to_time_t(now);
|
|
auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) % 1000;
|
|
|
|
std::tm utc_tm{};
|
|
#if defined(_WIN32)
|
|
gmtime_s(&utc_tm, &time_t_now);
|
|
#else
|
|
gmtime_r(&time_t_now, &utc_tm);
|
|
#endif
|
|
|
|
std::ostringstream oss;
|
|
oss << std::put_time(&utc_tm, "%Y-%m-%d %H:%M:%S") << '.' << std::setfill('0') << std::setw(3)
|
|
<< ms.count() << 'Z';
|
|
return oss.str();
|
|
}
|
|
|
|
#ifndef _WIN32
|
|
// Signal handler to print a message when the process is terminated.
|
|
// Uses only async-signal-safe functions.
|
|
void termination_signal_handler(int sig) {
|
|
const char *msg = "[ SIGNAL ] Process received SIGTERM\n";
|
|
// write() is async-signal-safe, unlike std::cout
|
|
ssize_t written = write(STDOUT_FILENO, msg, strlen(msg));
|
|
(void) written; // suppress "unused variable" warnings
|
|
// Re-raise with default handler to get proper exit status
|
|
std::signal(sig, SIG_DFL);
|
|
std::raise(sig);
|
|
}
|
|
#endif
|
|
|
|
} // namespace
|
|
|
|
int main(int argc, char *argv[]) {
|
|
#ifndef _WIN32
|
|
std::signal(SIGTERM, termination_signal_handler);
|
|
#endif
|
|
|
|
// Setup for TEST_CASE in test_interpreter.cpp, tagging on a large random number:
|
|
std::string updated_pythonpath("pybind11_test_with_catch_PYTHONPATH_2099743835476552");
|
|
const char *preexisting_pythonpath = getenv("PYTHONPATH");
|
|
if (preexisting_pythonpath != nullptr) {
|
|
#if defined(_WIN32)
|
|
updated_pythonpath += ';';
|
|
#else
|
|
updated_pythonpath += ':';
|
|
#endif
|
|
updated_pythonpath += preexisting_pythonpath;
|
|
}
|
|
#if defined(_WIN32)
|
|
_putenv_s("PYTHONPATH", updated_pythonpath.c_str());
|
|
#else
|
|
setenv("PYTHONPATH", updated_pythonpath.c_str(), /*replace=*/1);
|
|
#endif
|
|
|
|
std::cout << "[ STARTING ] " << get_utc_timestamp() << '\n';
|
|
std::cout.flush();
|
|
|
|
py::scoped_interpreter guard{};
|
|
|
|
auto result = Catch::Session().run(argc, argv);
|
|
|
|
std::cout << "[ DONE ] " << get_utc_timestamp() << " (result " << result << ")\n";
|
|
std::cout.flush();
|
|
|
|
return result < 0xff ? result : 0xff;
|
|
}
|