diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-02-24 23:23:58 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-02-26 13:17:44 -0800 |
| commit | a1ce1fef2d49d1d537776a5308ace7102a815fe5 (patch) | |
| tree | a1afe850d9ebd21f4b751eb68e1ec3dc60dab001 /runtime/base | |
| parent | 930f7b843ddc6e6530439d3fdb0e2133a6292f1e (diff) | |
| download | art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.zip art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.gz art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.bz2 | |
Split up CommonTest into CommonRuntimeTest and CommonCompilerTest
Change-Id: I8dcf6b29a5aecd445f1a3ddb06386cf81dbc9c70
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/mutex_test.cc | 4 | ||||
| -rw-r--r-- | runtime/base/timing_logger_test.cc | 4 | ||||
| -rw-r--r-- | runtime/base/unix_file/mapped_file_test.cc | 2 | ||||
| -rw-r--r-- | runtime/base/unix_file/random_access_file_test.h | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/runtime/base/mutex_test.cc b/runtime/base/mutex_test.cc index 1af8e0a..ee0b1be 100644 --- a/runtime/base/mutex_test.cc +++ b/runtime/base/mutex_test.cc @@ -16,11 +16,11 @@ #include "mutex.h" -#include "common_test.h" +#include "common_runtime_test.h" namespace art { -class MutexTest : public CommonTest {}; +class MutexTest : public CommonRuntimeTest {}; struct MutexTester { static void AssertDepth(Mutex& mu, uint32_t expected_depth) { diff --git a/runtime/base/timing_logger_test.cc b/runtime/base/timing_logger_test.cc index 03cc9cc..0757751 100644 --- a/runtime/base/timing_logger_test.cc +++ b/runtime/base/timing_logger_test.cc @@ -16,11 +16,11 @@ #include "timing_logger.h" -#include "common_test.h" +#include "common_runtime_test.h" namespace art { -class TimingLoggerTest : public CommonTest {}; +class TimingLoggerTest : public CommonRuntimeTest {}; // TODO: Negative test cases (improper pairing of EndSplit, etc.) diff --git a/runtime/base/unix_file/mapped_file_test.cc b/runtime/base/unix_file/mapped_file_test.cc index 49750f4..7e45321 100644 --- a/runtime/base/unix_file/mapped_file_test.cc +++ b/runtime/base/unix_file/mapped_file_test.cc @@ -30,7 +30,7 @@ class MappedFileTest : public RandomAccessFileTest { } void SetUp() { - art::CommonTest::SetEnvironmentVariables(android_data_); + art::CommonRuntimeTest::SetEnvironmentVariables(android_data_); good_path_ = GetTmpPath("some-file.txt"); int fd = TEMP_FAILURE_RETRY(open(good_path_.c_str(), O_CREAT|O_RDWR, 0666)); diff --git a/runtime/base/unix_file/random_access_file_test.h b/runtime/base/unix_file/random_access_file_test.h index 3152788..8a6605e 100644 --- a/runtime/base/unix_file/random_access_file_test.h +++ b/runtime/base/unix_file/random_access_file_test.h @@ -21,8 +21,7 @@ #include <string> -#include "common_test.h" -#include "gtest/gtest.h" +#include "common_runtime_test.h" #include "UniquePtr.h" namespace unix_file { @@ -37,7 +36,7 @@ class RandomAccessFileTest : public testing::Test { virtual RandomAccessFile* MakeTestFile() = 0; virtual void SetUp() { - art::CommonTest::SetEnvironmentVariables(android_data_); + art::CommonRuntimeTest::SetEnvironmentVariables(android_data_); } std::string GetTmpPath(const std::string& name) { |