diff options
Diffstat (limited to 'libs/hwui/tests/unit/main.cpp')
-rw-r--r-- | libs/hwui/tests/unit/main.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libs/hwui/tests/unit/main.cpp b/libs/hwui/tests/unit/main.cpp index cea84c057b63..406255d61d25 100644 --- a/libs/hwui/tests/unit/main.cpp +++ b/libs/hwui/tests/unit/main.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "gtest/gtest.h" #include "gmock/gmock.h" +#include "gtest/gtest.h" #include "Caches.h" #include "debug/GlesDriver.h" #include "debug/NullGlesDriver.h" #include "hwui/Typeface.h" -#include "thread/TaskManager.h" #include "tests/common/LeakChecker.h" +#include "thread/TaskManager.h" #include <signal.h> @@ -31,17 +31,14 @@ using namespace android; using namespace android::uirenderer; static auto CRASH_SIGNALS = { - SIGABRT, - SIGSEGV, - SIGBUS, + SIGABRT, SIGSEGV, SIGBUS, }; static map<int, struct sigaction> gSigChain; static void gtestSigHandler(int sig, siginfo_t* siginfo, void* context) { auto testinfo = ::testing::UnitTest::GetInstance()->current_test_info(); - printf("[ FAILED ] %s.%s\n", testinfo->test_case_name(), - testinfo->name()); + printf("[ FAILED ] %s.%s\n", testinfo->test_case_name(), testinfo->name()); printf("[ FATAL! ] Process crashed, aborting tests!\n"); fflush(stdout); @@ -53,9 +50,7 @@ static void gtestSigHandler(int sig, siginfo_t* siginfo, void* context) { class TypefaceEnvironment : public testing::Environment { public: - virtual void SetUp() { - Typeface::setRobotoTypefaceForTest(); - } + virtual void SetUp() { Typeface::setRobotoTypefaceForTest(); } }; int main(int argc, char* argv[]) { @@ -83,4 +78,3 @@ int main(int argc, char* argv[]) { test::LeakChecker::checkForLeaks(); return ret; } - |