From: Nico Weber <nicolasweber@gmx.de>
Date: Wed, 2 Mar 2016 23:29:29 +0000 (+0000)
Subject: clang-cl pch test: Instead of copying the input, use /Fp to not write into the test... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3412720b802c70e8a7c64f64f84d4c39730a24d2;p=clang

clang-cl pch test: Instead of copying the input, use /Fp to not write into the test directory.

Also fix a bug with /Fp and absolute paths uncovered by this.
Follow-up to r262487.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@262541 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 8965d3d6c3..f8d6fc7770 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -2246,7 +2246,7 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
   }
 
   // As an annoying special case, PCH generation doesn't strip the pathname.
-  if (JA.getType() == types::TY_PCH) {
+  if (JA.getType() == types::TY_PCH && !IsCLMode()) {
     llvm::sys::path::remove_filename(BasePath);
     if (BasePath.empty())
       BasePath = NamedOutput;
diff --git a/test/Driver/cl-pch-errorhandling.cpp b/test/Driver/cl-pch-errorhandling.cpp
index 41fcfbef0f..ec06bb5240 100644
--- a/test/Driver/cl-pch-errorhandling.cpp
+++ b/test/Driver/cl-pch-errorhandling.cpp
@@ -6,8 +6,7 @@
 // code generation, which makes this test require an x86 backend.
 // REQUIRES: x86-registered-target
 
-// RUN: cp %S/Inputs/pchfile.h %t.h
-// RUN: not %clang_cl -internal-enable-pch -Werror /Yc%t.h /FI%t.h /c -DERR_HEADER -- %s 2>&1 \
+// RUN: not %clang_cl -internal-enable-pch -Werror /Yc%S/Inputs/pchfile.h /FI%S/Inputs/pchfile.h /Fp%t.pch /c -DERR_HEADER -- %s 2>&1 \
 // RUN:   | FileCheck %s
 
 // CHECK: nope1