diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2020-06-15 11:51:59 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2020-06-15 12:51:38 -0700 |
| commit | 703fb74fb5d7b806f188f2814f8dd770add26eeb (patch) | |
| tree | 516a2719ec342905b0e5a2dc70cf20069146e8e8 /libmodprobe/libmodprobe_test.cpp | |
| parent | 9287716a1c7fe375a4c6031e6e31d98501bfdebd (diff) | |
modprobe: Use more inclusive language for modprobe and libmodprobe
blacklist is replaced with blocklist.
Test: none
Change-Id: I59f9fde5900b9aee82aca1eab4a6ded3d136063b
Diffstat (limited to 'libmodprobe/libmodprobe_test.cpp')
| -rw-r--r-- | libmodprobe/libmodprobe_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmodprobe/libmodprobe_test.cpp b/libmodprobe/libmodprobe_test.cpp index eea0abd52..5919c49be 100644 --- a/libmodprobe/libmodprobe_test.cpp +++ b/libmodprobe/libmodprobe_test.cpp @@ -113,9 +113,9 @@ TEST(libmodprobe, Test) { "options test9.ko param_x=1 param_y=2 param_z=3\n" "options test100.ko param_1=1\n"; - const std::string modules_blacklist = - "blacklist test9.ko\n" - "blacklist test3.ko\n"; + const std::string modules_blocklist = + "blocklist test9.ko\n" + "blocklist test3.ko\n"; const std::string modules_load = "test4.ko\n" @@ -139,7 +139,7 @@ TEST(libmodprobe, Test) { 0600, getuid(), getgid())); ASSERT_TRUE(android::base::WriteStringToFile(modules_load, dir_path + "/modules.load", 0600, getuid(), getgid())); - ASSERT_TRUE(android::base::WriteStringToFile(modules_blacklist, dir_path + "/modules.blacklist", + ASSERT_TRUE(android::base::WriteStringToFile(modules_blocklist, dir_path + "/modules.blocklist", 0600, getuid(), getgid())); for (auto i = test_modules.begin(); i != test_modules.end(); ++i) { @@ -176,6 +176,6 @@ TEST(libmodprobe, Test) { EXPECT_TRUE(modules_loaded == expected_after_remove); - m.EnableBlacklist(true); + m.EnableBlocklist(true); EXPECT_FALSE(m.LoadWithAliases("test4", true)); } |