Rolled back due to breaking existing tests.
PiperOrigin-RevId: 521555658 Change-Id: I09742faceb82b2b7ceb423e850a8b50d532ad6ff
This commit is contained in:
parent
b5fd99bbd5
commit
7ee260c549
@ -44,7 +44,6 @@
|
|||||||
#include <chrono> // NOLINT
|
#include <chrono> // NOLINT
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstring>
|
|
||||||
#include <initializer_list>
|
#include <initializer_list>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
@ -2982,25 +2981,6 @@ void TestSuite::Run() {
|
|||||||
|
|
||||||
TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
|
TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater();
|
||||||
|
|
||||||
// Ensure our tests are in a deterministic order.
|
|
||||||
//
|
|
||||||
// We do this by sorting lexicographically on (file, line number), providing
|
|
||||||
// an order matching what the user can see in the source code.
|
|
||||||
//
|
|
||||||
// In the common case the line number comparison shouldn't be necessary,
|
|
||||||
// because the registrations made by the TEST macro are executed in order
|
|
||||||
// within a translation unit. But this is not true of the manual registration
|
|
||||||
// API, and in more exotic scenarios a single file may be part of multiple
|
|
||||||
// translation units.
|
|
||||||
std::stable_sort(test_info_list_.begin(), test_info_list_.end(),
|
|
||||||
[](const TestInfo* const a, const TestInfo* const b) {
|
|
||||||
if (const int result = std::strcmp(a->file(), a->file())) {
|
|
||||||
return result < 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return a->line() < b->line();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Call both legacy and the new API
|
// Call both legacy and the new API
|
||||||
repeater->OnTestSuiteStart(*this);
|
repeater->OnTestSuiteStart(*this);
|
||||||
// Legacy API is deprecated but still available
|
// Legacy API is deprecated but still available
|
||||||
|
Loading…
Reference in New Issue
Block a user