commit f479835c7256b1dc57dd31d3a26a455e689e997a
author Jis G Jacob <studiokeys@blissroms.org> Thu Dec 07 20:59:28 2023 -0500
committer Jis G Jacob <studiokeys@blissroms.org> Mon Apr 08 10:55:50 2024 -0400
tree 3eee0a22823fe85b81fb3756d76a2c18dad7385e
parent 1eb54b9968ab389bd13f12fe65a1b1f6788eb860

Revert "Add more tests for mtectrl override"

This reverts commit 13bda9665a7023bfd4f3e52848919a4574cb1c94.

Change-Id: I4c47c78f7ee091a466b9b58c080a661becad4639

mtectrl/mtectrl_test.cc

diff --git a/mtectrl/mtectrl_test.cc b/mtectrl/mtectrl_test.cc
index aadd9d6..d4463cb 100644
--- a/mtectrl/mtectrl_test.cc
+++ b/mtectrl/mtectrl_test.cc
@@ -154,31 +154,6 @@
   EXPECT_EQ(TestProperty(), "none");
 }
 
-TEST_F(MteCtrlTest, set_read_force_off_none) {
-  Boot({});
-  SetMemtagProp("none");
-  SetOverrideProp("force_off");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag-off,forced");
-  SetOverrideProp("default");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "none");
-}
-
-TEST_F(MteCtrlTest, set_read_force_off_and_on) {
-  Boot({});
-  SetMemtagProp("memtag,memtag-once");
-  SetOverrideProp("force_off");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag-off,forced");
-  SetOverrideProp("default");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "none");
-  SetOverrideProp("force_on");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag,forced");
-}
-
 TEST_F(MteCtrlTest, set_read_force_off_already) {
   Boot({});
   SetMemtagProp("memtag-off,memtag-once");
@@ -190,20 +165,6 @@
   EXPECT_EQ(TestProperty(), "memtag-off");
 }
 
-TEST_F(MteCtrlTest, set_read_force_off_and_on_already) {
-  Boot({});
-  SetMemtagProp("memtag-off,memtag-once");
-  SetOverrideProp("force_off");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag-off");
-  SetOverrideProp("default");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag-off");
-  SetOverrideProp("force_on");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag,forced");
-}
-
 TEST_F(MteCtrlTest, set_read_force_on) {
   Boot({});
   SetMemtagProp("memtag-once");
@@ -215,31 +176,6 @@
   EXPECT_EQ(TestProperty(), "none");
 }
 
-TEST_F(MteCtrlTest, set_read_force_on_none) {
-  Boot({});
-  SetMemtagProp("none");
-  SetOverrideProp("force_on");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag,forced");
-  SetOverrideProp("default");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "none");
-}
-
-TEST_F(MteCtrlTest, set_read_force_on_and_off) {
-  Boot({});
-  SetMemtagProp("memtag-once");
-  SetOverrideProp("force_on");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag,forced");
-  SetOverrideProp("default");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "none");
-  SetOverrideProp("force_off");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag-off,forced");
-}
-
 TEST_F(MteCtrlTest, set_read_force_on_already) {
   Boot({});
   SetMemtagProp("memtag,memtag-once");
@@ -251,20 +187,6 @@
   EXPECT_EQ(TestProperty(), "memtag");
 }
 
-TEST_F(MteCtrlTest, set_read_force_on_and_off_already) {
-  Boot({});
-  SetMemtagProp("memtag,memtag-once");
-  SetOverrideProp("force_on");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag");
-  SetOverrideProp("default");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag");
-  SetOverrideProp("force_off");
-  Reboot();
-  EXPECT_EQ(TestProperty(), "memtag-off,forced");
-}
-
 TEST_F(MteCtrlTest, override) {
   Boot({});
   SetMemtagProp(("memtag"));