diff options
| -rw-r--r-- | clang/test/Driver/ps4-linker-win.c | 15 | ||||
| -rw-r--r-- | clang/test/lit.cfg | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/clang/test/Driver/ps4-linker-win.c b/clang/test/Driver/ps4-linker-win.c index 1681397b87a..e42fc963dce 100644 --- a/clang/test/Driver/ps4-linker-win.c +++ b/clang/test/Driver/ps4-linker-win.c @@ -10,17 +10,18 @@ // RUN: touch %T/ps4-ld.exe // RUN: touch %T/ps4-ld.gold.exe -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -fuse-ld=gold -### 2>&1 \ +// RUN: env "PATH=%T;%PATH%" %clang -target x86_64-scei-ps4 %s -fuse-ld=gold -### 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS4-GOLD %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -shared -### 2>&1 \ +// RUN: env "PATH=%T;%PATH%" %clang -target x86_64-scei-ps4 %s -shared -### 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS4-GOLD %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -### 2>&1 \ +// RUN: env "PATH=%T;%PATH%" %clang -target x86_64-scei-ps4 %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -fuse-ld=ps4 -### 2>&1 \ +// RUN: env "PATH=%T;%PATH%" %clang -target x86_64-scei-ps4 %s -fuse-ld=ps4 -### 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// RUN: env "PATH=%T" %clang -target x86_64-scei-ps4 %s -shared \ +// RUN: env "PATH=%T;%PATH%" %clang -target x86_64-scei-ps4 %s -shared \ // RUN: -fuse-ld=ps4 -### 2>&1 | FileCheck --check-prefix=CHECK-PS4-LINKER %s -// CHECK-PS4-GOLD: ps4-ld.gold.exe -// CHECK-PS4-LINKER: ps4-ld.exe +// FIXME: "Output\\" is hardcoded part of %T. +// CHECK-PS4-GOLD: Output\\ps4-ld.gold.exe" +// CHECK-PS4-LINKER: Output\\ps4-ld.exe" diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index 2e146191f15..dfdcf4a07c1 100644 --- a/clang/test/lit.cfg +++ b/clang/test/lit.cfg @@ -206,6 +206,7 @@ if has_plugins and config.llvm_plugin_ext: config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) config.substitutions.append( ('%pluginext', config.llvm_plugin_ext) ) +config.substitutions.append( ('%PATH%', config.environment['PATH']) ) if config.clang_examples: config.available_features.add('examples') |
