From 6d88545ede0693b8106c4eb0a6fcfa2fdbbbd157 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Fri, 17 Nov 2017 19:49:41 +0000 Subject: Enable PDB generation with lld in asan and cfi tests on Windows. PDB emission now works well enough that we can rely on it for these tests to pass. Differential Revision: https://reviews.llvm.org/D40188 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@318546 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/asan/TestCases/Windows/fuse-lld.cc | 6 +----- test/cfi/lit.cfg | 1 + test/cfi/stats.cpp | 2 +- test/lit.common.cfg | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/asan/TestCases/Windows/fuse-lld.cc b/test/asan/TestCases/Windows/fuse-lld.cc index c20e5ff6c..2aee0385d 100644 --- a/test/asan/TestCases/Windows/fuse-lld.cc +++ b/test/asan/TestCases/Windows/fuse-lld.cc @@ -2,11 +2,7 @@ // // REQUIRES: lld-available // -// FIXME: Use -fuse-ld=lld after the old COFF linker is removed. -// FIXME: Test will fail until we add flags for requesting dwarf or cv. -// RUNX: %clangxx_asan -O2 %s -o %t.exe -fuse-ld=lld -Wl,-debug -// RUN: %clangxx_asan -c -O2 %s -o %t.o -g -gdwarf -// RUN: lld-link %t.o -out:%t.exe -debug -nopdb -defaultlib:libcmt %asan_lib %asan_cxx_lib +// RUN: %clangxx_asan -O2 %s -o %t.exe -g -gcodeview -fuse-ld=lld -Wl,-debug // RUN: not %run %t.exe 2>&1 | FileCheck %s #include diff --git a/test/cfi/lit.cfg b/test/cfi/lit.cfg index 301d932ec..7dae9a0d5 100644 --- a/test/cfi/lit.cfg +++ b/test/cfi/lit.cfg @@ -32,6 +32,7 @@ if config.lto_supported: config.substitutions.append((r"%clangxx_cfi_diag ", clang_cfi + cxx + non_dso + diag)) config.substitutions.append((r"%clangxx_cfi_dso ", clang_cfi + cxx + dso)) config.substitutions.append((r"%clangxx_cfi_dso_diag ", clang_cfi + cxx + dso + diag)) + config.substitutions.append((r"%debug_info_flags", ' '.join(config.debug_info_flags))) else: config.unsupported = True diff --git a/test/cfi/stats.cpp b/test/cfi/stats.cpp index 56cc2dd51..ca6b3bf0d 100644 --- a/test/cfi/stats.cpp +++ b/test/cfi/stats.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx_cfi -g -fsanitize-stats -o %t %s +// RUN: %clangxx_cfi %debug_info_flags -fsanitize-stats -o %t %s // RUN: env SANITIZER_STATS_PATH=%t.stats %run %t // RUN: sanstats %t.stats | FileCheck %s diff --git a/test/lit.common.cfg b/test/lit.common.cfg index 48987dfda..56d4fef4e 100644 --- a/test/lit.common.cfg +++ b/test/lit.common.cfg @@ -254,8 +254,7 @@ elif config.host_os == 'Linux' and is_linux_lto_supported(): elif config.host_os == 'Windows' and is_windows_lto_supported(): config.lto_supported = True config.lto_launch = [] - # FIXME: Remove -nopdb when PDB writing is ready. - config.lto_flags = ["-fuse-ld=lld -Wl,-nopdb"] + config.lto_flags = ["-fuse-ld=lld"] else: config.lto_supported = False -- cgit v1.2.3