Skip to content

Commit ef67601

Browse files
committed
[asan] Fix build breakage from report_globals change
#104404 broke the Windows buildbot (https://lab.llvm.org/buildbot/#/builders/107/builds/1926). This fixes forward by updating the flags in the tests accordingly.
1 parent fe55c34 commit ef67601

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

compiler-rt/test/asan/TestCases/Windows/dll_global_dead_strip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: %clang_cl_asan %Od %p/dll_host.cpp %Fe%t
22
//
33
// RUN: %clang_cl_nocxx_asan %Gw %LD %Od %s %Fe%t.dll
4-
// RUN: %env_asan_opts=report_globals=2 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=NOSTRIP
4+
// RUN: %env_asan_opts=report_globals=1:verbosity=3 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=NOSTRIP
55
// RUN: %clang_cl_nocxx_asan %Gw %LD -O2 %s %Fe%t.dll \
66
// RUN: %if target={{.*-windows-gnu}} %{ -Wl,--gc-sections %} \
77
// RUN: %else %{ -link -opt:ref %}
8-
// RUN: %env_asan_opts=report_globals=2 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=STRIP
8+
// RUN: %env_asan_opts=report_globals=1:verbosity=3 %run %t %t.dll 2>&1 | FileCheck %s --check-prefix=STRIP
99

1010
#include <stdio.h>
1111

compiler-rt/test/asan/TestCases/Windows/dll_report_globals_symbolization_at_startup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clang_cl_asan %LD %Od -DDLL %s %Fe%t.dll \
22
// RUN: %if target={{.*-windows-gnu}} %{ -Wl,--out-implib,%t.lib %}
33
// RUN: %clang_cl_asan %Od -DEXE %s %t.lib %Fe%te.exe
4-
// RUN: %env_asan_opts=report_globals=2 %run %te.exe 2>&1 | FileCheck %s
4+
// RUN: %env_asan_opts=report_globals=1:verbosity=3 %run %te.exe 2>&1 | FileCheck %s
55

66
// FIXME: Currently, the MT runtime build crashes on startup due to dbghelp.dll
77
// initialization failure.

compiler-rt/test/asan/TestCases/Windows/global_dead_strip.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// RUN: %clang_cl_nocxx_asan %Gw %Od %s %Fe%t.exe
2-
// RUN: %env_asan_opts=report_globals=2 %t.exe 2>&1 | FileCheck %s --check-prefix=NOSTRIP
2+
// RUN: %env_asan_opts=report_globals=1:verbosity=3 %t.exe 2>&1 | FileCheck %s --check-prefix=NOSTRIP
33
// RUN: %clang_cl_nocxx_asan %Gw -O2 %s %Fe%t.exe \
44
// RUN: %if target={{.*-windows-gnu}} %{ -Wl,--gc-sections %} \
55
// RUN: %else %{ -link -opt:ref %}
6-
// RUN: %env_asan_opts=report_globals=2 %t.exe 2>&1 | FileCheck %s --check-prefix=STRIP
6+
// RUN: %env_asan_opts=report_globals=1:verbosity=3 %t.exe 2>&1 | FileCheck %s --check-prefix=STRIP
77

88
#include <stdio.h>
99
int dead_global = 42;

compiler-rt/test/asan/TestCases/Windows/report_globals_vs_freelibrary.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %clang_cl_asan %LD %Od -DDLL %s %Fe%t.dll
22
// RUN: %clang_cl_asan %Od -DEXE %s %Fe%te.exe
3-
// RUN: %env_asan_opts=report_globals=2 %run %te.exe %t.dll 2>&1 | FileCheck %s
3+
// RUN: %env_asan_opts=report_globals=1:verbosity=3 %run %te.exe %t.dll 2>&1 | FileCheck %s
44

55
#include <windows.h>
66
#include <stdio.h>

0 commit comments

Comments
 (0)