am 28f17701: Merge "Don\'t fail a test just because we aren\'t root."
				
					
				
			* commit '28f1770101d84153e100ad7bc0628b4ef3b6e85c': Don't fail a test just because we aren't root.
This commit is contained in:
		@@ -260,6 +260,11 @@ TEST_F(DlExtRelroSharingTest, RelroFileEmpty) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_F(DlExtRelroSharingTest, VerifyMemorySaving) {
 | 
					TEST_F(DlExtRelroSharingTest, VerifyMemorySaving) {
 | 
				
			||||||
 | 
					  if (geteuid() != 0) {
 | 
				
			||||||
 | 
					    GTEST_LOG_(INFO) << "This test must be run as root.\n";
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ASSERT_NO_FATAL_FAILURE(CreateRelroFile(LIBNAME));
 | 
					  ASSERT_NO_FATAL_FAILURE(CreateRelroFile(LIBNAME));
 | 
				
			||||||
  int relro_fd = open(relro_file_, O_RDONLY);
 | 
					  int relro_fd = open(relro_file_, O_RDONLY);
 | 
				
			||||||
  ASSERT_NOERROR(relro_fd);
 | 
					  ASSERT_NOERROR(relro_fd);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user