Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9c48fdb authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Modify tests to use executable memory." am: 13655cdc 

am: 4352ee87

* commit '4352ee87':
  Modify tests to use executable memory.
parents d43d8515 4352ee87

libbacktrace/backtrace_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ TEST(libbacktrace, check_unreadable_elf_local) { 
  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 @@ TEST(libbacktrace, check_unreadable_elf_remote) { 
      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);