From d72e891ec8723297912261d326091eb8d1db5050 Mon Sep 17 00:00:00 2001 From: Marat Dukhan Date: Thu, 8 Mar 2018 10:09:59 -0800 Subject: Modify chipset name tests to match changes in the library --- test/name/proc-cpuinfo-hardware.cc | 4 ++-- test/name/ro-board-platform.cc | 4 ++-- test/name/ro-product-board.cc | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/name/proc-cpuinfo-hardware.cc b/test/name/proc-cpuinfo-hardware.cc index 4ac8f66..1808422 100644 --- a/test/name/proc-cpuinfo-hardware.cc +++ b/test/name/proc-cpuinfo-hardware.cc @@ -56,8 +56,6 @@ TEST(PROC_CPUINFO_HARDWARE, qualcomm_msm) { parse_proc_cpuinfo_hardware("Qualcomm MSM8210")); EXPECT_EQ("Qualcomm MSM8212", parse_proc_cpuinfo_hardware("Qualcomm MSM 8212 (Flattened Device Tree)")); - EXPECT_EQ("Qualcomm MSM8212", - parse_proc_cpuinfo_hardware("Qualcomm MSM 8610 (Flattened Device Tree)", 4)); EXPECT_EQ("Qualcomm MSM8212", parse_proc_cpuinfo_hardware("Qualcomm MSM8212")); EXPECT_EQ("Qualcomm MSM8225", @@ -78,6 +76,8 @@ TEST(PROC_CPUINFO_HARDWARE, qualcomm_msm) { parse_proc_cpuinfo_hardware("Qualcomm MSM 8610 (Flattened Device Tree)", 2)); EXPECT_EQ("Qualcomm MSM8610", parse_proc_cpuinfo_hardware("Qualcomm MSM8610", 2)); + EXPECT_EQ("Qualcomm MSM8612", + parse_proc_cpuinfo_hardware("Qualcomm MSM 8610 (Flattened Device Tree)", 4)); EXPECT_EQ("Qualcomm MSM8612", parse_proc_cpuinfo_hardware("Qualcomm MSM 8612 (Flattened Device Tree)")); EXPECT_EQ("Qualcomm MSM8625", diff --git a/test/name/ro-board-platform.cc b/test/name/ro-board-platform.cc index e9a055e..713731d 100644 --- a/test/name/ro-board-platform.cc +++ b/test/name/ro-board-platform.cc @@ -32,12 +32,12 @@ TEST(RO_BOARD_PLATFORM, qualcomm_msm) { parse_ro_board_platform("msm7627a")); EXPECT_EQ("Qualcomm MSM8084", parse_ro_board_platform("msm8084")); - EXPECT_EQ("Qualcomm MSM8212", - parse_ro_board_platform("msm8610", 4)); EXPECT_EQ("Qualcomm MSM8226", parse_ro_board_platform("msm8226")); EXPECT_EQ("Qualcomm MSM8610", parse_ro_board_platform("msm8610", 2)); + EXPECT_EQ("Qualcomm MSM8612", + parse_ro_board_platform("msm8610", 4)); EXPECT_EQ("Qualcomm MSM8612", parse_ro_board_platform("MSM8612")); EXPECT_EQ("Qualcomm MSM8660", diff --git a/test/name/ro-product-board.cc b/test/name/ro-product-board.cc index b55abf8..ae2e8d6 100644 --- a/test/name/ro-product-board.cc +++ b/test/name/ro-product-board.cc @@ -36,8 +36,6 @@ TEST(RO_PRODUCT_BOARD, qualcomm_msm) { parse_ro_product_board("MSM8210")); EXPECT_EQ("Qualcomm MSM8212", parse_ro_product_board("MSM8212")); - EXPECT_EQ("Qualcomm MSM8212", - parse_ro_product_board("MSM8610", 4)); EXPECT_EQ("Qualcomm MSM8225", parse_ro_product_board("MSM8225")); EXPECT_EQ("Qualcomm MSM8226", @@ -54,6 +52,8 @@ TEST(RO_PRODUCT_BOARD, qualcomm_msm) { parse_ro_product_board("MSM8274")); EXPECT_EQ("Qualcomm MSM8610", parse_ro_product_board("MSM8610", 2)); + EXPECT_EQ("Qualcomm MSM8612", + parse_ro_product_board("MSM8610", 4)); EXPECT_EQ("Qualcomm MSM8612", parse_ro_product_board("MSM8612")); EXPECT_EQ("Qualcomm MSM8625", @@ -465,8 +465,6 @@ TEST(RO_PRODUCT_BOARD, spreadtrum) { } TEST(RO_PRODUCT_BOARD, texas_instruments) { - EXPECT_EQ("Texas Instruments OMAP4430", - parse_ro_product_board("piranha")); EXPECT_EQ("Texas Instruments OMAP4460", parse_ro_product_board("tuna")); } -- cgit v1.2.3