Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: base/debug/proc_maps_linux_unittest.cc

Issue 2611323002: Relanding "Multiprocess test client: Android child process launcher rework." (Closed)
Patch Set: Addressed nyquist@'s comment + sync Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/BUILD.gn ('k') | base/files/file_locking_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/debug/proc_maps_linux_unittest.cc
diff --git a/base/debug/proc_maps_linux_unittest.cc b/base/debug/proc_maps_linux_unittest.cc
index 2e35ca64c01d01fa177de96dd82f47ce4560b831..9b5bcaca0ebbc3824deec35de46af5b37d9f4d31 100644
--- a/base/debug/proc_maps_linux_unittest.cc
+++ b/base/debug/proc_maps_linux_unittest.cc
@@ -227,8 +227,12 @@ void CheckProcMapsRegions(const std::vector<MappedMemoryRegion> &regions) {
// ignore checking for the stack and address when running under Valgrind.
// See http://crbug.com/431702 for more details.
if (!RunningOnValgrind() && regions[i].path == "[stack]") {
+// On Android the test is run on a background thread, since [stack] is for
+// the main thread, we cannot test this.
+#if !defined(OS_ANDROID)
EXPECT_GE(address, regions[i].start);
EXPECT_LT(address, regions[i].end);
+#endif
EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::READ);
EXPECT_TRUE(regions[i].permissions & MappedMemoryRegion::WRITE);
EXPECT_FALSE(regions[i].permissions & MappedMemoryRegion::EXECUTE);
« no previous file with comments | « base/BUILD.gn ('k') | base/files/file_locking_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698