commit a9c48fdb28ca02538196d6f0b4292c6e3f53ac61
author Christopher Ferris <cferris@google.com> Sat Jan 16 19:34:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 16 19:34:51 2016 +0000
tree 291aebec048aa378b45c6493b6f30637a24abe55
parent d43d8515d06c54dadaa3054a5dcdac9a8c1bf0e8
parent 4352ee87fd74b931d4b58192fb8974e91aa899d0

Merge "Modify tests to use executable memory." am: 13655cdc77
am: 4352ee87fd

* commit '4352ee87fd74b931d4b58192fb8974e91aa899d0':
  Modify tests to use executable memory.

libbacktrace/backtrace_test.cpp

diff --git a/libbacktrace/backtrace_test.cpp b/libbacktrace/backtrace_test.cpp
index 23636db..7d829fe 100644
--- a/libbacktrace/backtrace_test.cpp
+++ b/libbacktrace/backtrace_test.cpp
@@ -1156,7 +1156,7 @@
   int fd = open(tmp_so_name, O_RDONLY);
   ASSERT_TRUE(fd != -1);
 
-  void* map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
+  void* map = mmap(NULL, map_size, PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0);
   ASSERT_TRUE(map != MAP_FAILED);
   close(fd);
   ASSERT_TRUE(unlink(tmp_so_name) != -1);
@@ -1206,7 +1206,7 @@
       exit(0);
     }
 
-    void* map = mmap(NULL, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
+    void* map = mmap(NULL, map_size, PROT_READ | PROT_EXEC, MAP_PRIVATE, fd, 0);
     if (map == MAP_FAILED) {
       fprintf(stderr, "Failed to map in memory: %s\n", strerror(errno));
       unlink(tmp_so_name);