Author: jiadinggai Date: Wed Sep 26 00:07:48 2018 New Revision: 343075 URL: http://llvm.org/viewvc/llvm-project?rev=343075&view=rev Log: [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 Modified: cfe/trunk/test/Driver/cuda-detect.cu cfe/trunk/test/Driver/cuda-macosx.cu Modified: cfe/trunk/test/Driver/cuda-detect.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cuda-detect.cu?rev=343075&r1=343074&r2=343075&view=diff ============================================================================== --- cfe/trunk/test/Driver/cuda-detect.cu (original) +++ cfe/trunk/test/Driver/cuda-detect.cu Wed Sep 26 00:07:48 2018 @@ -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 Modified: cfe/trunk/test/Driver/cuda-macosx.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cuda-macosx.cu?rev=343075&r1=343074&r2=343075&view=diff ============================================================================== --- cfe/trunk/test/Driver/cuda-macosx.cu (original) +++ cfe/trunk/test/Driver/cuda-macosx.cu Wed Sep 26 00:07:48 2018 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
