diff options
| -rw-r--r-- | llvm/test/Other/opt-bisect-legacy-pass-manager.ll | 2 | ||||
| -rw-r--r-- | llvm/test/ThinLTO/X86/cache.ll | 20 | ||||
| -rw-r--r-- | llvm/utils/lit/lit/TestRunner.py | 8 |
3 files changed, 18 insertions, 12 deletions
diff --git a/llvm/test/Other/opt-bisect-legacy-pass-manager.ll b/llvm/test/Other/opt-bisect-legacy-pass-manager.ll index bf89e80d496..560675e893c 100644 --- a/llvm/test/Other/opt-bisect-legacy-pass-manager.ll +++ b/llvm/test/Other/opt-bisect-legacy-pass-manager.ll @@ -38,7 +38,7 @@ ; utils/bisect) to locate the optimization that inlines the call to ; f2() in f3(). -; RUN: %python %S/opt-bisect-helper.py --start=0 --end=256 --optcmd=opt \ +; RUN: '%python' %S/opt-bisect-helper.py --start=0 --end=256 --optcmd=opt \ ; RUN: --filecheckcmd=FileCheck --test=%s \ ; RUN: --prefix=CHECK-BISECT-INLINE-HELPER \ ; RUN: | FileCheck %s --check-prefix=CHECK-BISECT-INLINE-RESULT diff --git a/llvm/test/ThinLTO/X86/cache.ll b/llvm/test/ThinLTO/X86/cache.ll index f3fcaf30987..6fddfb631b4 100644 --- a/llvm/test/ThinLTO/X86/cache.ll +++ b/llvm/test/ThinLTO/X86/cache.ll @@ -85,11 +85,11 @@ ; RUN: rm -Rf %t.cache && mkdir %t.cache ; Create cache files with different sizes. ; Only 8B, 16B and 76B files should stay after pruning. -; RUN: %python -c "print(' ' * 1023)" > %t.cache/llvmcache-foo-1024 -; RUN: %python -c "print(' ' * 15)" > %t.cache/llvmcache-foo-16 -; RUN: %python -c "print(' ' * 7)" > %t.cache/llvmcache-foo-8 -; RUN: %python -c "print(' ' * 75)" > %t.cache/llvmcache-foo-76 -; RUN: %python -c "print(' ' * 76)" > %t.cache/llvmcache-foo-77 +; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-1024', 'w') as file: file.truncate(1024)" +; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-16', 'w') as file: file.truncate(16)" +; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-8', 'w') as file: file.truncate(8)" +; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-76', 'w') as file: file.truncate(76)" +; RUN: "%python" -c "with open(r'%t.cache/llvmcache-foo-77', 'w') as file: file.truncate(77)" ; RUN: llvm-lto -thinlto-action=run -exported-symbol=globalfunc %t2.bc %t.bc -thinlto-cache-dir %t.cache --thinlto-cache-max-size-bytes 100 ; RUN: ls %t.cache/llvmcache-foo-16 ; RUN: ls %t.cache/llvmcache-foo-8 @@ -102,11 +102,11 @@ ; RUN: rm -Rf %t.cache && mkdir %t.cache ; Create cache files with different sizes. ; Only 8B and 16B files should stay after pruning. -; RUN: %python -c "print(' ' * 1023)" > %t.cache/llvmcache-foo-1024 -; RUN: %python -c "print(' ' * 15)" > %t.cache/llvmcache-foo-16 -; RUN: %python -c "print(' ' * 7)" > %t.cache/llvmcache-foo-8 -; RUN: %python -c "print(' ' * 75)" > %t.cache/llvmcache-foo-76 -; RUN: %python -c "print(' ' * 76)" > %t.cache/llvmcache-foo-77 +; RUN: "%python" -c "print(' ' * 1023)" > %t.cache/llvmcache-foo-1024 +; RUN: "%python" -c "print(' ' * 15)" > %t.cache/llvmcache-foo-16 +; RUN: "%python" -c "print(' ' * 7)" > %t.cache/llvmcache-foo-8 +; RUN: "%python" -c "print(' ' * 75)" > %t.cache/llvmcache-foo-76 +; RUN: "%python" -c "print(' ' * 76)" > %t.cache/llvmcache-foo-77 ; RUN: llvm-lto -thinlto-action=run -exported-symbol=globalfunc %t2.bc %t.bc -thinlto-cache-dir %t.cache --thinlto-cache-max-size-files 2 ; RUN: ls %t.cache/llvmcache-foo-16 ; RUN: ls %t.cache/llvmcache-foo-8 diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py index 5eecb80e2f3..bfd15961ba0 100644 --- a/llvm/utils/lit/lit/TestRunner.py +++ b/llvm/utils/lit/lit/TestRunner.py @@ -845,8 +845,14 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper): # Replace uses of /dev/null with temporary files. if kAvoidDevNull: + # In Python 2.x, basestring is the base class for all string (including unicode) + # In Python 3.x, basestring no longer exist and str is always unicode + try: + str_type = basestring + except NameError: + str_type = str for i,arg in enumerate(args): - if isinstance(arg, basestring) and kDevNull in arg: + if isinstance(arg, str_type) and kDevNull in arg: f = tempfile.NamedTemporaryFile(delete=False) f.close() named_temp_files.append(f.name) |
