- xbt_dynar_foreach(unit->tests, it_test, test) {
- file = (test->file != nullptr ? test->file : unit->file);
- line = (test->line != 0 ? test->line : unit->line);
- fprintf(stderr, " %s: %s [%s:%d]\n", (test->ignored ? " SKIP" : (test->expected_failure
- ? (test-> failed ? "EFAIL" : "EPASS") : (test->failed ? " FAIL" : " PASS"))),test->title, file, line);
-
- if ((test->expected_failure && !test->failed) || (!test->expected_failure && test->failed)) {
- xbt_dynar_foreach(test->logs, it_log, log) {
- file = (log->file != nullptr ? log->file : file);
- line = (log->line != 0 ? log->line : line);
- fprintf(stderr, " %s:%d: %s\n", file, line, log->text);
+ for (s_xbt_test_test const& test : unit.tests_) {
+ std::string file = test.file_;
+ int line = test.line_;
+ std::string resname;
+ if (test.ignored_)
+ resname = " SKIP";
+ else if (test.expected_failure_) {
+ if (test.failed_)
+ resname = "EFAIL";
+ else
+ resname = "EPASS";
+ } else {
+ if (test.failed_)
+ resname = " FAIL";
+ else
+ resname = " PASS";
+ }
+ std::cerr << " " << resname << ": " << test.title_ << " [" << file << ":" << line << "]\n";
+
+ if ((test.expected_failure_ && not test.failed_) || (not test.expected_failure_ && test.failed_)) {
+ for (s_xbt_test_log const& log : test.logs_) {
+ file = (log.file_.empty() ? file : log.file_);
+ line = (log.line_ == 0 ? line : log.line_);
+ std::cerr << " " << file << ":" << line << ": " << log.text_ << "\n";