about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2021-11-29 10:41:38 +0100
committerGitHub <noreply@github.com>2021-11-29 10:41:38 +0100
commite15e0ba45c5d004345ab4def70d88af068ed54c7 (patch)
treeb8e1742dd8a7c5eae29a58bf9ab5afe371e9c816 /src/test
parentb8a4a4c2327c7699713a7a2f205affbb9de22b0e (diff)
parente74e39a6990d4d66f52c44bb9d0d06e9e2202d21 (diff)
downloadrust-e15e0ba45c5d004345ab4def70d88af068ed54c7.tar.gz
rust-e15e0ba45c5d004345ab4def70d88af068ed54c7.zip
Rollup merge of #91349 - tmiasko:accumulate-remark-args, r=nikic
Accumulate all values of `-C remark` option

When `-C remark=...` option is specified multiple times,
accumulate all values instead of using only the last one.

r? `@nikic`
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/optimization-remark.rs13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/test/ui/optimization-remark.rs b/src/test/ui/optimization-remark.rs
index 7aedb09928b..36549cbc554 100644
--- a/src/test/ui/optimization-remark.rs
+++ b/src/test/ui/optimization-remark.rs
@@ -1,10 +1,19 @@
 // build-pass
 // ignore-pass
 // no-system-llvm
-// revisions: all inline
-//          compile-flags: --crate-type=lib -Cdebuginfo=1 -Copt-level=2
+// revisions: all inline merge1 merge2
+// compile-flags: --crate-type=lib -Cdebuginfo=1 -Copt-level=2
+//
+// Check that remarks can be enabled individually or with "all":
+//
 // [all]    compile-flags: -Cremark=all
 // [inline] compile-flags: -Cremark=inline
+//
+// Check that values of -Cremark flag are accumulated:
+//
+// [merge1] compile-flags: -Cremark=all    -Cremark=giraffe
+// [merge2] compile-flags: -Cremark=inline -Cremark=giraffe
+//
 // error-pattern: inline: f not inlined into g
 // dont-check-compiler-stderr