summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> 2017-01-16 10:22:29 +0100
committer Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> 2017-01-16 10:43:39 +0100
commitab6603fb77ed59407672297d2d476c63727a15ce (patch)
treea881ffae3cfa048a1b1315d4a0aed44a48fbbd11
parent4cddd03950bb21e950afd72cad87e963bc53ea10 (diff)
MIPS64: Make GetFeatureString() returns default instead of empty string
Since there isn't any feature left for MIPS64 (smp was recently removed), GetFeatureString() returns an empty string. This causes failures when running run-tests. dex2oat fails with following message: Error parsing '--instruction-set-features=': No instruction set features specified Also change expectations in instruction_set_features_mips64_test. Test: mma test-art-host-gtest Test: mma test-art-target-gtest-instruction_set_features_mips64_test Change-Id: Icc60a676a1b2fb10f89c888fa8a0d21fd0a105b5
-rw-r--r--runtime/arch/mips64/instruction_set_features_mips64.cc2
-rw-r--r--runtime/arch/mips64/instruction_set_features_mips64_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/arch/mips64/instruction_set_features_mips64.cc b/runtime/arch/mips64/instruction_set_features_mips64.cc
index 5606c1d858..5757906618 100644
--- a/runtime/arch/mips64/instruction_set_features_mips64.cc
+++ b/runtime/arch/mips64/instruction_set_features_mips64.cc
@@ -70,7 +70,7 @@ uint32_t Mips64InstructionSetFeatures::AsBitmap() const {
}
std::string Mips64InstructionSetFeatures::GetFeatureString() const {
- return "";
+ return "default";
}
std::unique_ptr<const InstructionSetFeatures>
diff --git a/runtime/arch/mips64/instruction_set_features_mips64_test.cc b/runtime/arch/mips64/instruction_set_features_mips64_test.cc
index 1d037947fa..380c4e5433 100644
--- a/runtime/arch/mips64/instruction_set_features_mips64_test.cc
+++ b/runtime/arch/mips64/instruction_set_features_mips64_test.cc
@@ -27,7 +27,7 @@ TEST(Mips64InstructionSetFeaturesTest, Mips64Features) {
ASSERT_TRUE(mips64_features.get() != nullptr) << error_msg;
EXPECT_EQ(mips64_features->GetInstructionSet(), kMips64);
EXPECT_TRUE(mips64_features->Equals(mips64_features.get()));
- EXPECT_STREQ("", mips64_features->GetFeatureString().c_str());
+ EXPECT_STREQ("default", mips64_features->GetFeatureString().c_str());
EXPECT_EQ(mips64_features->AsBitmap(), 0U);
}