The introduction relative line number support in the dg framework was
absolutely a good thing in terms of testsuite maintenance. However, it
also made it possible to have duplicated testnames.
The duplicated names cause our summary analysis scripts major headaches
if one of the tests pass and the other fails. This patch fixes a couple
of instances that have have caused problems in my tester. This is by no
means comprehensive, in fact, it's likely just a drop in the bucket.
Installing on the trunk,
Jeff
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f38b209ff07..9713cdaefed 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-03 Jeff Law <l...@redhat.com>
+
+ * gcc.dg/pr59963-2.c: Make testnames unique.
+ * gcc.dg/tree-ssa/builtin-sprintf-warn-18.c: Likewise.
+
2018-12-03 Richard Biener <rguent...@suse.de>
PR tree-optimization/88301
diff --git a/gcc/testsuite/gcc.dg/pr59963-2.c b/gcc/testsuite/gcc.dg/pr59963-2.c
index 286a5f9e1eb..f54a3126960 100644
--- a/gcc/testsuite/gcc.dg/pr59963-2.c
+++ b/gcc/testsuite/gcc.dg/pr59963-2.c
@@ -32,6 +32,6 @@ foo (int i)
-7, /* { dg-warning "15:-Wsign-conversion" } */
-8); /* { dg-warning "16:-Wsign-conversion" } */
bazu (i, i); /* { dg-warning "9:conversion" } */
- bazi (0x8, 0x80000000); /* { dg-warning "14:-Wsign-conversion" "" { xfail
int16 } } */
- /* { dg-warning "overflow in conversion from" "" {
target int16 } .-1 } */
+ bazi (0x8, 0x80000000); /* { dg-warning "14:-Wsign-conversion" "first" {
xfail int16 } } */
+ /* { dg-warning "overflow in conversion from"
"second" { target int16 } .-1 } */
}
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-18.c
b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-18.c
index 7064f8a6d58..2203e5263f7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-18.c
@@ -117,10 +117,10 @@ void test_width_and_precision_out_of_range (char *d)
{
/* The range here happens to be a property of the compiler, not
one of the target. */
- T ("%9223372036854775808i", 0); /* { dg-warning "width out of range" } */
- /* { dg-warning "result to exceed .INT_MAX." "" { target *-*-* } .-1 } */
- T ("%.9223372036854775808i", 0); /* { dg-warning "precision out of range"
} */
- /* { dg-warning "causes result to exceed .INT_MAX." "" { target *-*-* } .-1
} */
+ T ("%9223372036854775808i", 0); /* { dg-warning "width out of range"
"first" } */
+ /* { dg-warning "result to exceed .INT_MAX." "second" { target *-*-* } .-1 }
*/
+ T ("%.9223372036854775808i", 0); /* { dg-warning "precision out of range"
"first" } */
+ /* { dg-warning "causes result to exceed .INT_MAX." "second" { target *-*-*
} .-1 } */
/* The following is diagnosed by -Wformat (disabled here). */
/* T ("%9223372036854775808$i", 0); */
