Fix orthography of GetTestLibRoot().
Change-Id: Ib052329b3ebced12a7e2d75b3628b33c7043e0d8
diff --git a/tests/dl_test.cpp b/tests/dl_test.cpp
index 2f3e905..434eee5 100644
--- a/tests/dl_test.cpp
+++ b/tests/dl_test.cpp
@@ -118,7 +118,7 @@
TEST(dl, exec_linker_load_file) {
#if defined(__BIONIC__)
const char* path_to_linker = PathToLinker();
- std::string helper = GetTestlibRoot() + "/exec_linker_helper";
+ std::string helper = GetTestLibRoot() + "/exec_linker_helper";
std::string expected_output =
"ctor: argc=1 argv[0]=" + helper + "\n" +
"main: argc=1 argv[0]=" + helper + "\n" +
@@ -134,7 +134,7 @@
TEST(dl, exec_linker_load_from_zip) {
#if defined(__BIONIC__)
const char* path_to_linker = PathToLinker();
- std::string helper = GetTestlibRoot() +
+ std::string helper = GetTestLibRoot() +
"/libdlext_test_zip/libdlext_test_zip_zipaligned.zip!/libdir/exec_linker_helper";
std::string expected_output =
"ctor: argc=1 argv[0]=" + helper + "\n" +
@@ -161,7 +161,7 @@
TEST(dl, preinit_system_calls) {
#if defined(__BIONIC__)
SKIP_WITH_HWASAN << "hwasan not initialized in preinit_array, b/124007027";
- std::string helper = GetTestlibRoot() + "/preinit_syscall_test_helper";
+ std::string helper = GetTestLibRoot() + "/preinit_syscall_test_helper";
chmod(helper.c_str(), 0755); // TODO: "x" lost in CTS, b/34945607
ExecTestHelper eth;
eth.SetArgs({ helper.c_str(), nullptr });
@@ -172,7 +172,7 @@
TEST(dl, preinit_getauxval) {
#if defined(__BIONIC__)
SKIP_WITH_HWASAN << "hwasan not initialized in preinit_array, b/124007027";
- std::string helper = GetTestlibRoot() + "/preinit_getauxval_test_helper";
+ std::string helper = GetTestLibRoot() + "/preinit_getauxval_test_helper";
chmod(helper.c_str(), 0755); // TODO: "x" lost in CTS, b/34945607
ExecTestHelper eth;
eth.SetArgs({ helper.c_str(), nullptr });
@@ -186,7 +186,7 @@
TEST(dl, exec_without_ld_preload) {
#if defined(__BIONIC__)
- std::string helper = GetTestlibRoot() + "/ld_preload_test_helper";
+ std::string helper = GetTestLibRoot() + "/ld_preload_test_helper";
chmod(helper.c_str(), 0755);
ExecTestHelper eth;
eth.SetArgs({ helper.c_str(), nullptr });
@@ -196,8 +196,8 @@
TEST(dl, exec_with_ld_preload) {
#if defined(__BIONIC__)
- std::string helper = GetTestlibRoot() + "/ld_preload_test_helper";
- std::string env = std::string("LD_PRELOAD=") + GetTestlibRoot() + "/ld_preload_test_helper_lib2.so";
+ std::string helper = GetTestLibRoot() + "/ld_preload_test_helper";
+ std::string env = std::string("LD_PRELOAD=") + GetTestLibRoot() + "/ld_preload_test_helper_lib2.so";
chmod(helper.c_str(), 0755);
ExecTestHelper eth;
eth.SetArgs({ helper.c_str(), nullptr });
@@ -222,10 +222,10 @@
// The two libs are in ns2/ subdir.
TEST(dl, exec_without_ld_config_file) {
#if defined(__BIONIC__)
- std::string error_message = "CANNOT LINK EXECUTABLE \"" + GetTestlibRoot() +
+ std::string error_message = "CANNOT LINK EXECUTABLE \"" + GetTestLibRoot() +
"/ld_config_test_helper\": library \"ld_config_test_helper_lib1.so\" "
"not found: needed by main executable\n";
- std::string helper = GetTestlibRoot() + "/ld_config_test_helper";
+ std::string helper = GetTestLibRoot() + "/ld_config_test_helper";
chmod(helper.c_str(), 0755);
ExecTestHelper eth;
eth.SetArgs({ helper.c_str(), nullptr });
@@ -240,15 +240,15 @@
android_get_LD_LIBRARY_PATH(default_search_paths, sizeof(default_search_paths));
std::ofstream fout(config_file, std::ios::out);
- fout << "dir.test = " << GetTestlibRoot() << "/" << std::endl
+ fout << "dir.test = " << GetTestLibRoot() << "/" << std::endl
<< "[test]" << std::endl
<< "additional.namespaces = ns2" << std::endl
- << "namespace.default.search.paths = " << GetTestlibRoot() << std::endl
+ << "namespace.default.search.paths = " << GetTestLibRoot() << std::endl
<< "namespace.default.links = ns2" << std::endl
<< "namespace.default.link.ns2.shared_libs = "
"libc.so:libm.so:libdl.so:ld_config_test_helper_lib1.so"
<< std::endl
- << "namespace.ns2.search.paths = " << default_search_paths << ":" << GetTestlibRoot()
+ << "namespace.ns2.search.paths = " << default_search_paths << ":" << GetTestLibRoot()
<< "/ns2" << std::endl;
fout.close();
}
@@ -279,7 +279,7 @@
if (is_user_build()) {
GTEST_SKIP() << "LD_CONFIG_FILE is not supported on user build";
}
- std::string helper = GetTestlibRoot() + "/ld_config_test_helper";
+ std::string helper = GetTestLibRoot() + "/ld_config_test_helper";
TemporaryFile config_file;
create_ld_config_file(config_file.path);
std::string env = std::string("LD_CONFIG_FILE=") + config_file.path;
@@ -315,11 +315,11 @@
if (is_user_build()) {
GTEST_SKIP() << "LD_CONFIG_FILE is not supported on user build";
}
- std::string helper = GetTestlibRoot() + "/ld_config_test_helper";
+ std::string helper = GetTestLibRoot() + "/ld_config_test_helper";
TemporaryFile config_file;
create_ld_config_file(config_file.path);
std::string env = std::string("LD_CONFIG_FILE=") + config_file.path;
- std::string env2 = std::string("LD_PRELOAD=") + GetTestlibRoot() + "/ld_config_test_helper_lib3.so";
+ std::string env2 = std::string("LD_PRELOAD=") + GetTestLibRoot() + "/ld_config_test_helper_lib3.so";
chmod(helper.c_str(), 0755);
ExecTestHelper eth;
eth.SetArgs({ helper.c_str(), nullptr });
@@ -353,10 +353,10 @@
}
std::string error_message =
- std::string("CANNOT LINK EXECUTABLE ") + "\"" + GetTestlibRoot() +
+ std::string("CANNOT LINK EXECUTABLE ") + "\"" + GetTestLibRoot() +
"/ld_config_test_helper\": " +
"library \"ld_config_test_helper_lib1.so\" not found: needed by main executable\n";
- std::string helper = GetTestlibRoot() + "/ld_config_test_helper";
+ std::string helper = GetTestLibRoot() + "/ld_config_test_helper";
TemporaryFile config_file;
create_ld_config_file(config_file.path);
std::string env = std::string("LD_CONFIG_FILE=") + config_file.path;
@@ -371,7 +371,7 @@
static void RelocationsTest(const char* lib, const char* expectation) {
#if defined(__BIONIC__)
// Does readelf think the .so file looks right?
- const std::string path = GetTestlibRoot() + "/" + lib;
+ const std::string path = GetTestLibRoot() + "/" + lib;
ExecTestHelper eth;
eth.SetArgs({ "readelf", "-SW", path.c_str(), nullptr });
eth.Run([&]() { execvpe("readelf", eth.GetArgs(), eth.GetEnv()); }, 0, nullptr);