[gcc/devel/rust/master] tree-wide(testsuite): update all the builtin macro tests ...
Thomas Schwinge
tschwinge@gcc.gnu.org
Sat Aug 6 12:09:25 GMT 2022
https://gcc.gnu.org/g:8141f618bb5e1669f554868772305d02fff045f2
commit 8141f618bb5e1669f554868772305d02fff045f2
Author: liushuyu <liushuyu011@gmail.com>
Date: Tue Aug 2 17:09:12 2022 -0600
tree-wide(testsuite): update all the builtin macro tests ...
... now builtin macros need #[rustc_builtin_macro] annotation
Diff:
---
gcc/testsuite/rust/compile/builtin_macro_compile_error.rs | 1 +
gcc/testsuite/rust/compile/builtin_macro_concat.rs | 1 +
gcc/testsuite/rust/compile/builtin_macro_env.rs | 1 +
gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs | 1 +
gcc/testsuite/rust/compile/builtin_macro_include_str.rs | 1 +
gcc/testsuite/rust/compile/macro42.rs | 1 +
gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs | 1 +
gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs | 1 +
gcc/testsuite/rust/execute/torture/builtin_macro_env.rs | 2 +-
gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs | 2 +-
gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs | 2 +-
gcc/testsuite/rust/execute/torture/builtin_macro_line.rs | 3 ++-
gcc/testsuite/rust/execute/torture/builtin_macros1.rs | 1 +
gcc/testsuite/rust/execute/torture/builtin_macros3.rs | 1 +
gcc/testsuite/rust/execute/torture/macros29.rs | 1 +
gcc/testsuite/rust/execute/torture/macros30.rs | 1 +
gcc/testsuite/rust/execute/torture/macros31.rs | 1 +
17 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs b/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs
index 6f9a8cefebc..9d224406a3e 100644
--- a/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs
+++ b/gcc/testsuite/rust/compile/builtin_macro_compile_error.rs
@@ -1,3 +1,4 @@
+#[rustc_builtin_macro]
macro_rules! compile_error {
() => {{}};
}
diff --git a/gcc/testsuite/rust/compile/builtin_macro_concat.rs b/gcc/testsuite/rust/compile/builtin_macro_concat.rs
index b37f80fc299..9b878af764d 100644
--- a/gcc/testsuite/rust/compile/builtin_macro_concat.rs
+++ b/gcc/testsuite/rust/compile/builtin_macro_concat.rs
@@ -1,3 +1,4 @@
+#[rustc_builtin_macro]
macro_rules! concat {
() => {{}};
}
diff --git a/gcc/testsuite/rust/compile/builtin_macro_env.rs b/gcc/testsuite/rust/compile/builtin_macro_env.rs
index 8c50a7d8901..289e6db2cf1 100644
--- a/gcc/testsuite/rust/compile/builtin_macro_env.rs
+++ b/gcc/testsuite/rust/compile/builtin_macro_env.rs
@@ -1,3 +1,4 @@
+#[rustc_builtin_macro]
macro_rules! env {
() => {{}};
}
diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs b/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs
index 966c073a794..38716d33bcd 100644
--- a/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs
+++ b/gcc/testsuite/rust/compile/builtin_macro_include_bytes.rs
@@ -1,3 +1,4 @@
+#[rustc_builtin_macro]
macro_rules! include_bytes {
() => {{}};
}
diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_str.rs b/gcc/testsuite/rust/compile/builtin_macro_include_str.rs
index 3e559cb92cb..38f5e3b7334 100644
--- a/gcc/testsuite/rust/compile/builtin_macro_include_str.rs
+++ b/gcc/testsuite/rust/compile/builtin_macro_include_str.rs
@@ -1,3 +1,4 @@
+#[rustc_builtin_macro]
macro_rules! include_str {
() => {{}};
}
diff --git a/gcc/testsuite/rust/compile/macro42.rs b/gcc/testsuite/rust/compile/macro42.rs
index 29fa651fcd2..52d150b82ba 100644
--- a/gcc/testsuite/rust/compile/macro42.rs
+++ b/gcc/testsuite/rust/compile/macro42.rs
@@ -1,4 +1,5 @@
// { dg-additional-options "-w -frust-cfg=A" }
+#[rustc_builtin_macro]
macro_rules! cfg {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs
index 9fa5222d61f..fad2daef6bc 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macro_cfg.rs
@@ -1,5 +1,6 @@
// { dg-additional-options "-w -frust-cfg=A" }
// { dg-output "A\n" }
+#[rustc_builtin_macro]
macro_rules! cfg {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs
index 555d49caf60..9b33924f5a1 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macro_concat.rs
@@ -1,4 +1,5 @@
// { dg-output "\ntest10btrue2.15\ntest10bfalse2.151\n" }
+#[rustc_builtin_macro]
macro_rules! concat {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs
index 211ddfc26f2..a5c80b25728 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macro_env.rs
@@ -1,6 +1,6 @@
// { dg-output "VALUE\nVALUE\n" }
// { dg-set-compiler-env-var ENV_MACRO_TEST "VALUE" }
-
+#[rustc_builtin_macro]
macro_rules! env {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs
index 49da09300a0..087f0220de5 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macro_include_bytes.rs
@@ -1,5 +1,5 @@
// { dg-output "104\n33\n1\n" }
-
+#[rustc_builtin_macro]
macro_rules! include_bytes {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs
index 334b9c6f17e..6f9871d379c 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macro_include_str.rs
@@ -1,5 +1,5 @@
// { dg-output "hello, include!\n" }
-
+#[rustc_builtin_macro]
macro_rules! include_str {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs b/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs
index 6153bf5968c..02541ed52e2 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macro_line.rs
@@ -1,4 +1,4 @@
-// { dg-output "17\n20\n" }
+// { dg-output "18\n21\n" }
extern "C" {
fn printf(fmt: *const i8, ...);
}
@@ -9,6 +9,7 @@ fn print(s: u32) {
}
}
+#[rustc_builtin_macro]
macro_rules! line {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macros1.rs b/gcc/testsuite/rust/execute/torture/builtin_macros1.rs
index 6f52c37150f..5976478e426 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macros1.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macros1.rs
@@ -1,4 +1,5 @@
// { dg-output "rust/execute/torture/builtin_macros1.rs" }
+#[rustc_builtin_macro]
macro_rules! file {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/builtin_macros3.rs b/gcc/testsuite/rust/execute/torture/builtin_macros3.rs
index 6c0facb3d6a..24555cbdb8a 100644
--- a/gcc/testsuite/rust/execute/torture/builtin_macros3.rs
+++ b/gcc/testsuite/rust/execute/torture/builtin_macros3.rs
@@ -1,4 +1,5 @@
// { dg-output "14\n42\n" }
+#[rustc_builtin_macro]
macro_rules! column {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/macros29.rs b/gcc/testsuite/rust/execute/torture/macros29.rs
index 506d660d6aa..306979b9b5b 100644
--- a/gcc/testsuite/rust/execute/torture/macros29.rs
+++ b/gcc/testsuite/rust/execute/torture/macros29.rs
@@ -1,4 +1,5 @@
// { dg-output "1\n" }
+#[rustc_builtin_macro]
macro_rules! concat {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/macros30.rs b/gcc/testsuite/rust/execute/torture/macros30.rs
index 8f54b05be7d..ab36f5e78af 100644
--- a/gcc/testsuite/rust/execute/torture/macros30.rs
+++ b/gcc/testsuite/rust/execute/torture/macros30.rs
@@ -1,4 +1,5 @@
// { dg-output "1\n" }
+#[rustc_builtin_macro]
macro_rules! concat {
() => {{}};
}
diff --git a/gcc/testsuite/rust/execute/torture/macros31.rs b/gcc/testsuite/rust/execute/torture/macros31.rs
index 6ad6d7e3c99..483f897a92b 100644
--- a/gcc/testsuite/rust/execute/torture/macros31.rs
+++ b/gcc/testsuite/rust/execute/torture/macros31.rs
@@ -1,5 +1,6 @@
// { dg-additional-options "-w -frust-cfg=A" }
// { dg-output "A\nB\n" }
+#[rustc_builtin_macro]
macro_rules! cfg {
() => {{}};
}
More information about the Gcc-cvs
mailing list