From 75d6623156d3e69aa1ecc1d91c6a2c6879a97e74 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 12 Nov 2019 11:10:28 +0100 Subject: [PATCH] Fix test-suite fallout. 2019-11-12 Martin Liska * gcc.dg/completion-3.c: Append = to all expected results and sort expected output. * gcc.dg/pr83620.c: Update error message. * gcc.dg/spellcheck-params-2.c: Likewise. * gcc.dg/spellcheck-params.c: Likewise. * gcc.misc-tests/help.exp: Update expected output. From-SVN: r278089 --- gcc/testsuite/ChangeLog | 9 +++++++++ gcc/testsuite/gcc.dg/completion-3.c | 16 ++++++++-------- gcc/testsuite/gcc.dg/pr83620.c | 2 +- gcc/testsuite/gcc.dg/spellcheck-params-2.c | 2 +- gcc/testsuite/gcc.dg/spellcheck-params.c | 2 +- gcc/testsuite/gcc.misc-tests/help.exp | 4 +--- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 45fb8e52018..8c63ddf5c0e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2019-11-12 Martin Liska + + * gcc.dg/completion-3.c: Append = to all expected + results and sort expected output. + * gcc.dg/pr83620.c: Update error message. + * gcc.dg/spellcheck-params-2.c: Likewise. + * gcc.dg/spellcheck-params.c: Likewise. + * gcc.misc-tests/help.exp: Update expected output. + 2019-11-12 Maciej W. Rozycki Tobias Burnus Frederik Harwath diff --git a/gcc/testsuite/gcc.dg/completion-3.c b/gcc/testsuite/gcc.dg/completion-3.c index 3c4a89ffdd5..a240993dd45 100644 --- a/gcc/testsuite/gcc.dg/completion-3.c +++ b/gcc/testsuite/gcc.dg/completion-3.c @@ -2,12 +2,12 @@ /* { dg-options "--completion=--param=asan-" } */ /* { dg-begin-multiline-output "" } ---param=asan-stack ---param=asan-instrument-allocas ---param=asan-globals ---param=asan-instrument-writes ---param=asan-instrument-reads ---param=asan-memintrin ---param=asan-use-after-return ---param=asan-instrumentation-with-call-threshold +--param=asan-globals= +--param=asan-instrument-allocas= +--param=asan-instrument-reads= +--param=asan-instrument-writes= +--param=asan-instrumentation-with-call-threshold= +--param=asan-memintrin= +--param=asan-stack= +--param=asan-use-after-return= { dg-end-multiline-output "" } */ diff --git a/gcc/testsuite/gcc.dg/pr83620.c b/gcc/testsuite/gcc.dg/pr83620.c index e0e44a3b421..cf6eb91197f 100644 --- a/gcc/testsuite/gcc.dg/pr83620.c +++ b/gcc/testsuite/gcc.dg/pr83620.c @@ -1,7 +1,7 @@ /* PR rtl-optimization/86620 */ /* { dg-do compile } */ /* { dg-options "-O2 -flive-range-shrinkage --param=max-sched-ready-insns=0" } */ -/* { dg-error "minimum value of parameter 'max-sched-ready-insns' is 1" "" { target *-*-* } 0 } */ +/* { dg-error "argument to '--param=max-sched-ready-insns=' is not between 1 and 65536" "" { target *-*-* } 0 } */ void foo (void) diff --git a/gcc/testsuite/gcc.dg/spellcheck-params-2.c b/gcc/testsuite/gcc.dg/spellcheck-params-2.c index 8187de43481..0f56241f48f 100644 --- a/gcc/testsuite/gcc.dg/spellcheck-params-2.c +++ b/gcc/testsuite/gcc.dg/spellcheck-params-2.c @@ -1,4 +1,4 @@ /* { dg-do compile } */ /* { dg-options "--param does-not-resemble-anything=42" } */ -/* { dg-error "invalid '--param' name 'does-not-resemble-anything'" "" { target *-*-* } 0 } */ +/* { dg-error "unrecognized command-line option '--param=does-not-resemble-anything=42'" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/spellcheck-params.c b/gcc/testsuite/gcc.dg/spellcheck-params.c index 01e1343ab9e..4010a5df0d2 100644 --- a/gcc/testsuite/gcc.dg/spellcheck-params.c +++ b/gcc/testsuite/gcc.dg/spellcheck-params.c @@ -1,4 +1,4 @@ /* { dg-do compile } */ /* { dg-options "--param max-early-inliner-iteration=3" } */ -/* { dg-error "invalid '--param' name 'max-early-inliner-iteration'; did you mean 'max-early-inliner-iterations'?" "" { target *-*-* } 0 } */ +/* { dg-error "unrecognized command-line option '--param=max-early-inliner-iteration=3'; did you mean '--param=max-early-inliner-iterations='?" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.misc-tests/help.exp b/gcc/testsuite/gcc.misc-tests/help.exp index 4bb359f698d..60e794b1f46 100644 --- a/gcc/testsuite/gcc.misc-tests/help.exp +++ b/gcc/testsuite/gcc.misc-tests/help.exp @@ -64,7 +64,7 @@ check_for_options c "-v --help" "" {are likely to\n -std} "" check_for_options c "--help=optimizers" "-O" " -g " "" check_for_options c "--help=params" "maximum number of" "-Wunsafe-loop-optimizations" "" check_for_options_with_filter c "--help=params" \ - "^The --param option recognizes the following as parameters:$" "" {[^.]$} "" + "^The following options control parameters:$" "" {[^.]$} "" check_for_options c "--help=C" "-ansi" "-gnatO" "" check_for_options c {--help=C++} {-std=c\+\+} "-gnatO" "" check_for_options c "--help=common" "-dumpbase" "-gnatO" "" @@ -133,8 +133,6 @@ check_for_options c "--help=warnings,^joined" \ "^ +-Wtrigraphs" "^ +-Wformat=" "" check_for_options c "--help=joined,separate" \ "^ +-I" "" "" -check_for_options c "--help=^joined,separate" \ - "^ +--param " "" "" check_for_options c "--help=joined,^separate" \ "^ +--help=" "" "" check_for_options c "--help=joined,undocumented" "" "" "" -- 2.30.2