From: Jiading Gai <jiading.gai@gmail.com>
Date: Wed, 26 Sep 2018 07:07:48 +0000 (+0000)
Subject: [CUDA] Fix two failed test cases using --cuda-path-ignore-env
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0049e3f0513f2432ee0891aa567f492057c00661;p=clang

[CUDA] Fix two failed test cases using --cuda-path-ignore-env

Add --cuda-path-ignore-env option to those test cases to ensure the clang
driver always pick the CUDA path specified by --sysroot.

Reviewers: tra, Hahnfeld

Differential Revision: https://reviews.llvm.org/D52259



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

diff --git a/test/Driver/cuda-detect.cu b/test/Driver/cuda-detect.cu
index 9d5a47a2ec..e5dfe36571 100644
--- a/test/Driver/cuda-detect.cu
+++ b/test/Driver/cuda-detect.cu
@@ -14,9 +14,9 @@
 
 
 // RUN: %clang -v --target=i386-unknown-linux \
-// RUN:   --sysroot=%S/Inputs/CUDA 2>&1 | FileCheck %s
+// RUN:   --sysroot=%S/Inputs/CUDA --cuda-path-ignore-env 2>&1 | FileCheck %s
 // RUN: %clang -v --target=i386-apple-macosx \
-// RUN:   --sysroot=%S/Inputs/CUDA 2>&1 | FileCheck %s
+// RUN:   --sysroot=%S/Inputs/CUDA --cuda-path-ignore-env 2>&1 | FileCheck %s
 
 // RUN: %clang -v --target=i386-unknown-linux \
 // RUN:   --cuda-path=%S/Inputs/CUDA/usr/local/cuda 2>&1 | FileCheck %s
diff --git a/test/Driver/cuda-macosx.cu b/test/Driver/cuda-macosx.cu
index ad0bcf756e..a4700a3b81 100644
--- a/test/Driver/cuda-macosx.cu
+++ b/test/Driver/cuda-macosx.cu
@@ -3,6 +3,6 @@
 // REQUIRES: nvptx-registered-target
 //
 // RUN: %clang -v --target=i386-apple-macosx \
-// RUN:   --sysroot=%S/Inputs/CUDA-macosx 2>&1 | FileCheck %s
+// RUN:   --sysroot=%S/Inputs/CUDA-macosx --cuda-path-ignore-env 2>&1 | FileCheck %s
 
 // CHECK: Found CUDA installation: {{.*}}/Inputs/CUDA-macosx/usr/local/cuda