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/utils_test.cc | |
parent | 930f7b843ddc6e6530439d3fdb0e2133a6292f1e (diff) | |
download | art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.gz art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.tar.bz2 art-a1ce1fef2d49d1d537776a5308ace7102a815fe5.zip |
Split up CommonTest into CommonRuntimeTest and CommonCompilerTest
Change-Id: I8dcf6b29a5aecd445f1a3ddb06386cf81dbc9c70
Diffstat (limited to 'runtime/utils_test.cc')
-rw-r--r-- | runtime/utils_test.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index 0d237e2a53..d804f6a8af 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -14,7 +14,9 @@ * limitations under the License. */ -#include "common_test.h" +#include "utils.h" + +#include "common_runtime_test.h" #include "mirror/array.h" #include "mirror/array-inl.h" #include "mirror/object-inl.h" @@ -22,15 +24,13 @@ #include "mirror/string.h" #include "scoped_thread_state_change.h" #include "sirt_ref.h" -#include "utils.h" namespace art { std::string PrettyArguments(const char* signature); std::string PrettyReturnType(const char* signature); -class UtilsTest : public CommonTest { -}; +class UtilsTest : public CommonRuntimeTest {}; TEST_F(UtilsTest, PrettyDescriptor_ArrayReferences) { EXPECT_EQ("java.lang.Class[]", PrettyDescriptor("[Ljava/lang/Class;")); @@ -362,9 +362,7 @@ TEST_F(UtilsTest, ExecSuccess) { EXPECT_EQ(0U, error_msg.size()) << error_msg; } -// TODO: Disabled due to hang tearing down CommonTest. -// Renable after splitting into RuntimeTest and CompilerTest. -TEST_F(UtilsTest, DISABLED_ExecError) { +TEST_F(UtilsTest, ExecError) { std::vector<std::string> command; command.push_back("bogus"); std::string error_msg; |