Fix art_imgdiag_tests
Don't check that zygote/image pagemap files are different, because they
refer to the same file in ImgDiagTest.ImageDiffPidSelf.
Test: art/tools/run-gtests.sh /apex/com.android.art/bin/art/x86/art_imgdiag_tests
Change-Id: Ife65683f7b6953a2c830d5f88871e6899b07c421
diff --git a/imgdiag/imgdiag.cc b/imgdiag/imgdiag.cc
index 43355ad..d5007bf 100644
--- a/imgdiag/imgdiag.cc
+++ b/imgdiag/imgdiag.cc
@@ -1552,7 +1552,10 @@
// Out parameters:
uint64_t& page_count,
std::string& error_msg) {
- CHECK_NE(page_map_file.GetPath(), clean_pagemap_file.GetPath());
+ // Checking that files don't point to the same thing breaks art_imgdiag_tests,
+ // because the test runs imgdiag with zygote_diff_pid equal to image_diff_pid.
+ // CHECK_NE(page_map_file.GetPath(), clean_pagemap_file.GetPath());
+ CHECK_NE(&page_map_file, &clean_pagemap_file);
// Constants are from https://www.kernel.org/doc/Documentation/vm/pagemap.txt