gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CodeUnloading/Macros.C test

Browse Source 
Clang diagnostic verification was unhappy with the previous state of
affairs. Move affected `expected-(warning|note)` markers to `Macros.h`.

Apparently, as Jonas Hahnfeld found, this failure originated in commit
8deb57c04a5ceea96533d095092fcd4f71d1df94, but is not to be reverted
per discussion in https://github.com/root-project/root/pull/12454.
This commit is contained in:
Javier Lopez-Gomez 2023-05-19 15:55:35 +02:00 committed by jenkins
parent 11a1a348f8
commit e635331e85
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/CodeUnloading/Macros.C
View File

@ -13,16 +13,8 @@
"TEST"
// CHECK: (const char [5]) "TEST"
// Make sure one Transactin can handle redefinitions
// Make sure one transaction can handle redefinitions
#include "Macros.h"
// expected-warning@Macros.h:3 {{'TEST' macro redefined}}
// expected-note@Macros.h:2 {{previous definition is here}}
// expected-warning@Macros.h:4 {{'TEST' macro redefined}}
// expected-note@Macros.h:3 {{previous definition is here}}
// expected-warning@Macros.h:5 {{'TEST' macro redefined}}
// expected-note@Macros.h:4 {{previous definition is here}}
// expected-warning@Macros.h:6 {{'TEST' macro redefined}}
// expected-note@Macros.h:5 {{previous definition is here}}
TEST
// CHECK: (const char [7]) "TEST 4"
@ -31,7 +23,7 @@ TEST
.undo //include
.undo // FIXME: REMOVE once print unloading is merged
TEST // expected-error@2 {{use of undeclared identifier 'TEST'}}
TEST // expected-error {{use of undeclared identifier 'TEST'}}
#define TEST "DEFINED"
#undef TEST
@ -42,13 +34,11 @@ TEST
.undo // define
.undo // FIXME: REMOVE once print unloading is merged
TEST // expected-error@2 {{use of undeclared identifier 'TEST'}}
TEST // expected-error {{use of undeclared identifier 'TEST'}}
// Make sure one Transactin can handle undef, redef
// Make sure one transaction can handle undef, redef
#define TESTB
#include "Macros.h"
// expected-warning@Macros.h:19 {{'TEST' macro redefined}}
// expected-note@Macros.h:18 {{previous definition is here}}
TEST // CHECK: (const char [7]) "TEST G"
.q

12
test/CodeUnloading/Macros.h
View File

@ -4,6 +4,14 @@
#define TEST "TEST 2"
#define TEST "TEST 3"
#define TEST "TEST 4"
// expected-warning@3 {{'TEST' macro redefined}}
// expected-note@2 {{previous definition is here}}
// expected-warning@4 {{'TEST' macro redefined}}
// expected-note@3 {{previous definition is here}}
// expected-warning@5 {{'TEST' macro redefined}}
// expected-note@4 {{previous definition is here}}
// expected-warning@6 {{'TEST' macro redefined}}
// expected-note@5 {{previous definition is here}}
#else
#define TEST "TEST A"
#undef TEST
@ -17,4 +25,6 @@
#undef TEST
#define TEST "TEST F"
#define TEST "TEST G"
#endif
// expected-warning@27 {{'TEST' macro redefined}}
// expected-note@26 {{previous definition is here}}
#endif