Reapply r276185

Fix the test case that should not depend on dir iteration order.




git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@276197 91177308-0d34-0410-b5e6-96231b3b80d8
3 files changed