aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2020-11-30 08:59:23 -0700
committerJeff Law <law@redhat.com>2020-11-30 09:00:14 -0700
commite40fece7c9b3731f4cff060f712c132ff100cab4 (patch)
tree0e5a5457b657c1b0eec694c2bb8b0c7a0e22bf27
parent82ac923da681dbde2af1bdb353053ec9ee8ef18b (diff)
downloadgcc-e40fece7c9b3731f4cff060f712c132ff100cab4.zip
gcc-e40fece7c9b3731f4cff060f712c132ff100cab4.tar.gz
gcc-e40fece7c9b3731f4cff060f712c132ff100cab4.tar.bz2
Fix non-unique testnames
gcc/testsuite * g++.dg/warn/Wnonnull5.C: Fix non-unique testnames. * g++.dg/warn/Wplacement-new-size-8.C: Likewise.
-rw-r--r--gcc/testsuite/g++.dg/warn/Wnonnull5.C16
-rw-r--r--gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C2
2 files changed, 9 insertions, 9 deletions
diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull5.C b/gcc/testsuite/g++.dg/warn/Wnonnull5.C
index 8b25d2d..78862d4 100644
--- a/gcc/testsuite/g++.dg/warn/Wnonnull5.C
+++ b/gcc/testsuite/g++.dg/warn/Wnonnull5.C
@@ -36,7 +36,7 @@ struct S
void warn_nullptr_this ()
{
((S*)nullptr)->f0 (""); // { dg-warning "3:'this' pointer null" "pr86568" { xfail *-*-* } }
- // { dg-warning "this' pointer null" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "this' pointer null" "pr86568 second variant" { target *-*-* } .-1 }
}
void warn_null_this_cst ()
@@ -49,15 +49,15 @@ void warn_null_this_var ()
{
S* null = 0;
null->f2 (&null); // { dg-warning "3:'this' pointer null" "pr86568" { xfail *-*-* } }
- // { dg-warning "'this' pointer null" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "'this' pointer null" "pr86568 second variant" { target *-*-* } .-1 }
}
void warn_nullptr (S s)
{
s.f3 (nullptr, &s); // { dg-warning "9:argument 1 null where non-null expected" "pr86568" { xfail *-*-* } }
- // { dg-warning "argument 1 null where non-null expected" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "argument 1 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 }
s.f3 (&s, nullptr); // { dg-warning "13:argument 2 null where non-null expected" "pr86568" { xfail *-*-* } }
- // { dg-warning "argument 2 null where non-null expected" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "argument 2 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 }
}
@@ -72,9 +72,9 @@ void warn_null_var (S s)
{
void* null = 0;
s.f5 (null, &s); // { dg-warning "9:argument 1 null where non-null expected" "pr86568" { xfail *-*-* } }
- // { dg-warning "argument 1 null where non-null expected" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "argument 1 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 }
s.f5 (&s, null); // { dg-warning "16:argument 2 null where non-null expected" "pr86568" { xfail *-*-* } }
- // { dg-warning "argument 2 null where non-null expected" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "argument 2 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 }
}
void warn_null_cond (S s, void *null)
@@ -83,9 +83,9 @@ void warn_null_cond (S s, void *null)
return;
s.f6 (null, &s); // { dg-warning "9:argument 1 null where non-null expected" "pr86568" { xfail *-*-* } }
- // { dg-warning "argument 1 null where non-null expected" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "argument 1 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 }
s.f6 (&s, null); // { dg-warning "13:argument 2 null where non-null expected" "pr86568" { xfail *-*-* } }
- // { dg-warning "argument 2 null where non-null expected" "pr86568" { target *-*-* } .-1 }
+ // { dg-warning "argument 2 null where non-null expected" "pr86568 second variant" { target *-*-* } .-1 }
}
diff --git a/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C b/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C
index 77bd331..12cd4cd 100644
--- a/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C
+++ b/gcc/testsuite/g++.dg/warn/Wplacement-new-size-8.C
@@ -43,7 +43,7 @@ void test_cst_off ()
/* Offsets are treated as signed so SIZE_MAX is indistinguishable
from -1. */
char ca1[1]; // { dg-message "at offset \\d+ from 'ca1' declared here" "note" { xfail *-*-* } }
- // { dg-message "at offset -1 from 'ca1' declared here" "note" { target *-*-* } .-1 }
+ // { dg-message "at offset -1 from 'ca1' declared here" "note second variant" { target *-*-* } .-1 }
new (ca1 + SIZE_MAX) S<1>; // { dg-warning "constructing an object of type 'S<1>' and size '1' in a region of type 'char \\\[1]' and size '0'" }
}
}