From 640e790af2921f17d24b639ce9f0afa23d79ac78 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Thu, 26 Jul 2018 14:16:19 +0000 Subject: [PATCH] [test] Disable dsymutil update test on windows Apparently, the issue with dsymutil update functionality on Windows was that Windows doesn't like dsymutil renaming files that have open handles to them. This disables the new accelerator test and updates the comment in the other two test. We should be able to enable the tests again once we updated the implementation to use TempFile::keep() to keep the temporary files in MachOUtils. A big thank you to Jeremy Morse from Sony for figuring this out and bringing it to my attention. llvm-svn: 338030 --- llvm/test/tools/dsymutil/X86/accelerator.test | 4 ++++ llvm/test/tools/dsymutil/X86/update-one-CU.test | 3 ++- llvm/test/tools/dsymutil/X86/update.test | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/llvm/test/tools/dsymutil/X86/accelerator.test b/llvm/test/tools/dsymutil/X86/accelerator.test index 96fc58e..906b0e6 100644 --- a/llvm/test/tools/dsymutil/X86/accelerator.test +++ b/llvm/test/tools/dsymutil/X86/accelerator.test @@ -1,3 +1,7 @@ +UNSUPPORTED: system-windows +Windows does not like renaming files that have open handles to them. We +need to use TempFile::keep to move them in a portable way. + RUN: dsymutil -accelerator=Dwarf -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.dwarf.dSYM RUN: dsymutil -accelerator=Apple -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 -o %t.apple.dSYM diff --git a/llvm/test/tools/dsymutil/X86/update-one-CU.test b/llvm/test/tools/dsymutil/X86/update-one-CU.test index 0759334..5d36ce7 100644 --- a/llvm/test/tools/dsymutil/X86/update-one-CU.test +++ b/llvm/test/tools/dsymutil/X86/update-one-CU.test @@ -1,5 +1,6 @@ UNSUPPORTED: system-windows -Remove UNSUPPORTED once we figure out why this fails on Windows. +Windows does not like renaming files that have open handles to them. We +need to use TempFile::keep to move them in a portable way. RUN: dsymutil -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.dSYM RUN: dsymutil -update %t.dSYM diff --git a/llvm/test/tools/dsymutil/X86/update.test b/llvm/test/tools/dsymutil/X86/update.test index 93e9b36..cbfff63 100644 --- a/llvm/test/tools/dsymutil/X86/update.test +++ b/llvm/test/tools/dsymutil/X86/update.test @@ -1,5 +1,6 @@ UNSUPPORTED: system-windows -Remove UNSUPPORTED once we figure out why this fails on Windows. +Windows does not like renaming files that have open handles to them. We +need to use TempFile::keep to move them in a portable way. RUN: rm -rf %t.dir RUN: mkdir -p %t.dir -- 2.7.4