commit ab0a1d5cd60b76e4f9f826d33269269b31611dd9
author dimitry <dimitry@google.com> Wed Oct 11 19:30:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 11 19:30:45 2017 +0000
tree a84b47775696e4194fff1365e4435ceecc5bed91
parent a1933210ef464aef20799919640a4fffb2dd3b3c
parent c46b60240375758b6dc40b8116dc4a4565c9f6b5

Merge "Fix dlopen_vdso test" am: 1d297d2654
am: c46b602403

Change-Id: I9e7ce728b318b609edcc069b6e4b705b5862a651

tests/dlfcn_test.cpp

diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 66ea0f9..adc5ee4 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -21,6 +21,9 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#if __has_include(<sys/auxv.h>)
+#include <sys/auxv.h>
+#endif
 
 #include <string>
 #include <thread>
@@ -246,6 +249,12 @@
 }
 
 TEST(dlfcn, dlopen_vdso) {
+#if __has_include(<sys/auxv.h>)
+  if (getauxval(AT_SYSINFO_EHDR) == 0) {
+    GTEST_LOG_(INFO) << "getauxval(AT_SYSINFO_EHDR) == 0, skipping this test.";
+    return;
+  }
+#endif
   void* handle = dlopen("linux-vdso.so.1", RTLD_NOW);
   ASSERT_TRUE(handle != nullptr) << dlerror();
   dlclose(handle);