This is an archive of the discontinued LLVM Phabricator instance.

Differential D86622

Fix failing tests after VCTOOLSDIR change
ClosedPublic

Authored by zahen on Aug 26 2020, 7:28 AM.

Details

Reviewers
hans
Commits
rG7a34dca0f391: Fix failing tests after VCTOOLSDIR change
Summary

Switch from hardcoded x64 arch to a regex in the target triple

Diff Detail

Event Timeline

zahen created this revision.Aug 26 2020, 7:28 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 26 2020, 7:28 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
zahen requested review of this revision.Aug 26 2020, 7:28 AM
hans accepted this revision.Aug 26 2020, 7:29 AM
This revision is now accepted and ready to land.Aug 26 2020, 7:29 AM
zahen added a comment.Aug 26 2020, 7:33 AM

Sorry again about the break! As with the initial patch, I'll need you to land this change.

This revision was landed with ongoing or failed builds.Aug 26 2020, 7:34 AM
Closed by commit rG7a34dca0f391: Fix failing tests after VCTOOLSDIR change (authored by zahen, committed by hans). · Explain Why
This revision was automatically updated to reflect the committed changes.
hans added a commit: rG7a34dca0f391: Fix failing tests after VCTOOLSDIR change.
hans added a comment.Aug 26 2020, 7:35 AM
In D86622#2238992, @zahen wrote:

Sorry again about the break! As with the initial patch, I'll need you to land this change.

No worries, sorry for not catching it in the review. Pushed now as 7a34dca0f3918ab1c0397e56dd64a3c04164c8b6.

Harbormaster completed remote builds in B69603: Diff 287967.Aug 26 2020, 8:01 AM
aganea added a subscriber: aganea.Aug 26 2020, 8:33 AM

I've pushed one more fix: rG33ce275fc156c8b015acfad918937028b2cc235c

Revision Contents

PathSize
clang/
test/
Driver/
2 lines

Diff 287968

clang/test/Driver/cl-options.c

Show First 20 Lines • Show All 678 Lines • ▼ Show 20 Lines
// RUN: %clang_cl -O2 -MD /clang:-fno-slp-vectorize /clang:-MD /clang:-MF /clang:my_dependency_file.dep -### -- %s 2>&1 | FileCheck -check-prefix=CLANG %s // RUN: %clang_cl -O2 -MD /clang:-fno-slp-vectorize /clang:-MD /clang:-MF /clang:my_dependency_file.dep -### -- %s 2>&1 | FileCheck -check-prefix=CLANG %s
// CLANG: "--dependent-lib=msvcrt" // CLANG: "--dependent-lib=msvcrt"
// CLANG-SAME: "-dependency-file" "my_dependency_file.dep" // CLANG-SAME: "-dependency-file" "my_dependency_file.dep"
// CLANG-NOT: "--dependent-lib=libcmt" // CLANG-NOT: "--dependent-lib=libcmt"
// CLANG-NOT: "-vectorize-slp" // CLANG-NOT: "-vectorize-slp"
// Validate that the default triple is used when run an empty tools dir is specified // Validate that the default triple is used when run an empty tools dir is specified
// RUN: %clang_cl -vctoolsdir "" -### -- %s 2>&1 | FileCheck %s --check-prefix VCTOOLSDIR // RUN: %clang_cl -vctoolsdir "" -### -- %s 2>&1 | FileCheck %s --check-prefix VCTOOLSDIR
// VCTOOLSDIR: "-cc1" "-triple" "x86_64-pc-windows-msvc19.11.0" // VCTOOLSDIR: "-triple" "{{[a-zA-Z0-9_-]*}}-pc-windows-msvc19.11.0"
// Validate that built-in include paths are based on the supplied path // Validate that built-in include paths are based on the supplied path
// RUN: %clang_cl -vctoolsdir "/fake" -### -- %s 2>&1 | FileCheck %s --check-prefix FAKEDIR // RUN: %clang_cl -vctoolsdir "/fake" -### -- %s 2>&1 | FileCheck %s --check-prefix FAKEDIR
// FAKEDIR: "-internal-isystem" "/fake{{.}}include" // FAKEDIR: "-internal-isystem" "/fake{{.}}include"
// FAKEDIR: "-internal-isystem" "/fake{{.}}atlmfc{{.}}include" // FAKEDIR: "-internal-isystem" "/fake{{.}}atlmfc{{.}}include"
void f() { } void f() { }