aboutsummaryrefslogtreecommitdiffstats
path: root/tests/dlext_test.cpp
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2014-04-22 17:48:08 -0700
committerDmitriy Ivanov <dimitry@google.com>2014-04-22 18:44:55 -0700
commit53c884e28166678b2fa40cb3763d1549074628ad (patch)
treea527d79401bc89a1fbb818869191509f78e88080 /tests/dlext_test.cpp
parent635edbdf93a127da7db77d9cd174615734b4fb85 (diff)
downloadandroid_bionic-53c884e28166678b2fa40cb3763d1549074628ad.tar.gz
android_bionic-53c884e28166678b2fa40cb3763d1549074628ad.tar.bz2
android_bionic-53c884e28166678b2fa40cb3763d1549074628ad.zip
Get ANDROID_DATA dir from enviroment
Change-Id: Ie3675bd27bbc779fc2140f95b930eadd14838753
Diffstat (limited to 'tests/dlext_test.cpp')
-rw-r--r--tests/dlext_test.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp
index 14dff2bc8..872cc5b36 100644
--- a/tests/dlext_test.cpp
+++ b/tests/dlext_test.cpp
@@ -40,7 +40,6 @@
typedef int (*fn)(void);
#define LIBNAME "libdlext_test.so"
#define LIBSIZE 1024*1024 // how much address space to reserve for it
-#define RELRO_FILE "/data/local/tmp/libdlext_test.relro"
class DlExtTest : public ::testing::Test {
@@ -154,7 +153,11 @@ TEST_F(DlExtTest, RelroShareChildWrites) {
extinfo.reserved_size = LIBSIZE;
int relro_fd;
- relro_fd = open(RELRO_FILE, O_CREAT | O_RDWR | O_TRUNC, 0644);
+ char relro_file[PATH_MAX];
+ const char* android_data = getenv("ANDROID_DATA");
+ ASSERT_TRUE(android_data != NULL);
+ snprintf(relro_file, sizeof(relro_file), "%s/local/tmp/libdlext_test.relro", android_data);
+ relro_fd = open(relro_file, O_CREAT | O_RDWR | O_TRUNC, 0644);
extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_WRITE_RELRO;
ASSERT_NOERROR(relro_fd);
extinfo.relro_fd = relro_fd;
@@ -178,7 +181,7 @@ TEST_F(DlExtTest, RelroShareChildWrites) {
ASSERT_TRUE(WIFEXITED(status));
ASSERT_EQ(0, WEXITSTATUS(status));
- relro_fd = open(RELRO_FILE, O_RDONLY);
+ relro_fd = open(relro_file, O_RDONLY);
ASSERT_NOERROR(relro_fd);
extinfo.flags = ANDROID_DLEXT_RESERVED_ADDRESS | ANDROID_DLEXT_USE_RELRO;
extinfo.relro_fd = relro_fd;