[llvm] r365170 - Fix patch not passing test cases

[Alex Brachet via llvm-commits]

Author: abrachet
Date: Thu Jul  4 18:28:41 2019
New Revision: 365170

URL: http://llvm.org/viewvc/llvm-project?rev=365170&view=rev
Log:
Fix patch not passing test cases

Modified:
    llvm/trunk/test/tools/llvm-objcopy/ELF/respect-umask.test
    llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp

Modified: llvm/trunk/test/tools/llvm-objcopy/ELF/respect-umask.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/respect-umask.test?rev=365170&r1=365169&r2=365170&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/respect-umask.test (original)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/respect-umask.test Thu Jul  4 18:28:41 2019
@@ -19,20 +19,19 @@
 # RUN: chmod 0777 %t
 # RUN: llvm-objcopy %t %t1
 # RUN: ls -l %t1 | cut -f 1 -d ' ' > %t1.perms
-##   : cmp %t1.perms %t.0755
+# RUN: cmp %t1.perms %t.0755
 
 # RUN: umask 0237
 # RUN: chmod 0707 %t
 # RUN: llvm-objcopy %t %t1
 # RUN: ls -l %t1 | cut -f 1 -d ' ' > %t1.perms
-##   : cmp %t1.perms %t.0500
+# RUN: cmp %t1.perms %t.0500
 
 # RUN: umask 0222
 # RUN: chmod 0777 %t
 # RUN: llvm-objcopy %t %t1
 # RUN: ls -l %t1 | cut -f 1 -d ' ' > %t1.perms
-##   : cmp %t1.perms %t.0555
-
+# RUN: cmp %t1.perms %t.0555
 
 --- !ELF
 FileHeader:

Modified: llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp?rev=365170&r1=365169&r2=365170&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/llvm-objcopy.cpp Thu Jul  4 18:28:41 2019
@@ -215,7 +215,8 @@ static Error restoreStatOnFile(StringRef
             FD, Stat.getLastAccessedTime(), Stat.getLastModificationTime()))
       return createFileError(Filename, EC);
 
-  if (auto EC = sys::fs::setPermissions(Filename, Stat.permissions()))
+  if (auto EC = sys::fs::setPermissions(Filename, Stat.permissions(),
+                                        /*respectUmask=*/true))
     return createFileError(Filename, EC);
 
   if (auto EC = sys::Process::SafelyCloseFileDescriptor(FD))