Merge "SF: Optionally skip slow unittests" (0b647b2f) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/tests/unittests/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ cc_test {
		},
		srcs: [
		":libsurfaceflinger_sources",
		"libsurfaceflinger_unittest_main.cpp",
		"CompositionTest.cpp",
		"DisplayIdentificationTest.cpp",
		"DisplayTransactionTest.cpp",

services/surfaceflinger/tests/unittests/TimeStatsTest.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@

		#include "TimeStats/TimeStats.h"

		#include "libsurfaceflinger_unittest_main.h"

		using namespace android::surfaceflinger;
		using namespace google::protobuf;

		@@ -486,6 +488,10 @@ TEST_F(TimeStatsTest, canDumpWithInvalidMaxLayers) {
		}

		TEST_F(TimeStatsTest, canSurviveMonkey) {
		if (g_noSlowTests) {
		GTEST_SKIP();
		}

		EXPECT_TRUE(inputCommand(InputCommand::ENABLE, FMT_STRING).empty());

		for (size_t i = 0; i < 10000000; ++i) {

services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest_main.cpp

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <gtest/gtest.h>

		#include "libsurfaceflinger_unittest_main.h"

		// ------------------------------------------------------------------------
		// To pass extra command line arguments to the Google Test executable from
		// atest, you have to use this somewhat verbose syntax:
		//
		// clang-format off
		//
		// atest libsurfaceflinger_unittest -- --module-arg libsurfaceflinger_unittest:native-test-flag:<--flag>[:<value>]
		//
		// For example:
		//
		// atest libsurfaceflinger_unittest -- --module-arg libsurfaceflinger_unittest:native-test-flag:--no-slow
		//
		// clang-format on
		// ------------------------------------------------------------------------

		// Set to true if "--no-slow" is passed to the test.
		bool g_noSlowTests = false;

		int main(int argc, char **argv) {
		::testing::InitGoogleTest(&argc, argv);

		for (int i = 1; i < argc; i++) {
		if (strcmp(argv[i], "--no-slow") == 0) {
		g_noSlowTests = true;
		}
		}

		return RUN_ALL_TESTS();
		}
		No newline at end of file

services/surfaceflinger/tests/unittests/libsurfaceflinger_unittest_main.h

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		// Set to true if "--no-slow" is passed to the test.
		extern bool g_noSlowTests;