diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2018-01-02 09:35:10 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2018-01-02 09:35:10 +0000 |
| commit | d9551a3cb4a454e0818e345bdba510e1cb6dbbdd (patch) | |
| tree | 1b82ea5bc9fa943c67e6208696da855cd917d3b8 | |
| parent | 1ae65827b5b1c280e1db04f7d609a92ddf40e0a9 (diff) | |
| download | clang-d9551a3cb4a454e0818e345bdba510e1cb6dbbdd.tar.gz | |
[Driver] Fix unused variables and test-writing-into-workdir after r321621
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@321639 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/Driver.cpp | 4 | ||||
| -rw-r--r-- | test/Driver/config-file.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 4d6cc68295..325b233ac5 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -682,7 +682,7 @@ bool Driver::loadConfigFile() { CfgDir.append( CLOptions->getLastArgValue(options::OPT_config_system_dir_EQ)); if (!CfgDir.empty()) { - if (std::error_code EC = llvm::sys::fs::make_absolute(CfgDir)) + if (llvm::sys::fs::make_absolute(CfgDir).value() != 0) SystemConfigDir.clear(); else SystemConfigDir = std::string(CfgDir.begin(), CfgDir.end()); @@ -693,7 +693,7 @@ bool Driver::loadConfigFile() { CfgDir.append( CLOptions->getLastArgValue(options::OPT_config_user_dir_EQ)); if (!CfgDir.empty()) { - if (std::error_code EC = llvm::sys::fs::make_absolute(CfgDir)) + if (llvm::sys::fs::make_absolute(CfgDir).value() != 0) UserConfigDir.clear(); else UserConfigDir = std::string(CfgDir.begin(), CfgDir.end()); diff --git a/test/Driver/config-file.c b/test/Driver/config-file.c index 2d2d7a72b4..3b42f950cf 100644 --- a/test/Driver/config-file.c +++ b/test/Driver/config-file.c @@ -1,6 +1,6 @@ //--- Config file search directories // -// RUN: %clang --config-system-dir=%S/Inputs/config --config-user-dir=%S/Inputs/config2 -v 2>&1 | FileCheck %s -check-prefix CHECK-DIRS +// RUN: %clang --config-system-dir=%S/Inputs/config --config-user-dir=%S/Inputs/config2 -o /dev/null -v 2>&1 | FileCheck %s -check-prefix CHECK-DIRS // CHECK-DIRS: System configuration file directory: {{.*}}/Inputs/config // CHECK-DIRS: User configuration file directory: {{.*}}/Inputs/config2 @@ -15,7 +15,7 @@ //--- Config file (full path) in output of -v // -// RUN: %clang --config %S/Inputs/config-1.cfg -c %s -v 2>&1 | FileCheck %s -check-prefix CHECK-V +// RUN: %clang --config %S/Inputs/config-1.cfg -c %s -o /dev/null -v 2>&1 | FileCheck %s -check-prefix CHECK-V // CHECK-V: Configuration file: {{.*}}Inputs{{.}}config-1.cfg // CHECK-V: -Werror // CHECK-V: -std=c99 @@ -31,7 +31,7 @@ //--- Config file in output of -v // -// RUN: %clang --config-system-dir=%S/Inputs --config-user-dir= --config config-1.cfg -c %s -v 2>&1 | FileCheck %s -check-prefix CHECK-V2 +// RUN: %clang --config-system-dir=%S/Inputs --config-user-dir= --config config-1.cfg -c %s -o /dev/null -v 2>&1 | FileCheck %s -check-prefix CHECK-V2 // CHECK-V2: Configuration file: {{.*}}Inputs{{.}}config-1.cfg // CHECK-V2: -Werror // CHECK-V2: -std=c99 @@ -61,12 +61,12 @@ //--- Unused options in config file do not produce warnings // -// RUN: %clang --config %S/Inputs/config-4.cfg -c %s -v 2>&1 | FileCheck %s -check-prefix CHECK-UNUSED +// RUN: %clang --config %S/Inputs/config-4.cfg -c %s -o /dev/null -v 2>&1 | FileCheck %s -check-prefix CHECK-UNUSED // CHECK-UNUSED-NOT: argument unused during compilation: //--- User directory is searched first. // -// RUN: %clang --config-system-dir=%S/Inputs/config --config-user-dir=%S/Inputs/config2 --config config-4 -c %s -v 2>&1 | FileCheck %s -check-prefix CHECK-PRECEDENCE +// RUN: %clang --config-system-dir=%S/Inputs/config --config-user-dir=%S/Inputs/config2 --config config-4 -c %s -o /dev/null -v 2>&1 | FileCheck %s -check-prefix CHECK-PRECEDENCE // CHECK-PRECEDENCE: Configuration file: {{.*}}Inputs{{.}}config2{{.}}config-4.cfg // CHECK-PRECEDENCE: -Wall |