From c431b9dc4b23cc950eb313695258df5d89f53b22 Mon Sep 17 00:00:00 2001 From: David Sehr Date: Fri, 2 Mar 2018 12:01:51 -0800 Subject: Move most of runtime/base to libartbase/base Enforce the layering that code in runtime/base should not depend on runtime by separating it into libartbase. Some of the code in runtime/base depends on the Runtime class, so it cannot be moved yet. Also, some of the tests depend on CommonRuntimeTest, which itself needs to be factored (in a subsequent CL). Bug: 22322814 Test: make -j 50 checkbuild make -j 50 test-art-host Change-Id: I8b096c1e2542f829eb456b4b057c71421b77d7e2 --- libartbase/base/logging_test.cc | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 libartbase/base/logging_test.cc (limited to 'libartbase/base/logging_test.cc') diff --git a/libartbase/base/logging_test.cc b/libartbase/base/logging_test.cc new file mode 100644 index 0000000000..404e080b03 --- /dev/null +++ b/libartbase/base/logging_test.cc @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2017 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 "logging.h" + +#include + +#include "android-base/logging.h" +#include "base/bit_utils.h" +#include "base/macros.h" +#include "common_runtime_test.h" +#include "runtime_debug.h" + +namespace art { + +static void SimpleAborter(const char* msg) { + LOG(FATAL_WITHOUT_ABORT) << msg; + _exit(1); +} + +class LoggingTest : public CommonRuntimeTest { + protected: + void PostRuntimeCreate() OVERRIDE { + // In our abort tests we really don't want the runtime to create a real dump. + android::base::SetAborter(SimpleAborter); + } +}; + +#ifdef NDEBUG +#error Unexpected NDEBUG +#endif + +class TestClass { + public: + DECLARE_RUNTIME_DEBUG_FLAG(kFlag); +}; +DEFINE_RUNTIME_DEBUG_FLAG(TestClass, kFlag); + +TEST_F(LoggingTest, DECL_DEF) { + SetRuntimeDebugFlagsEnabled(true); + EXPECT_TRUE(TestClass::kFlag); + + SetRuntimeDebugFlagsEnabled(false); + EXPECT_FALSE(TestClass::kFlag); +} + +} // namespace art -- cgit v1.2.3-59-g8ed1b