aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2022-12-22 17:53:21 -0500
committerJason Merrill <jason@redhat.com>2022-12-22 18:38:37 -0500
commit23be9d78f4bcd773ed24818a4b963227536dbff8 (patch)
tree7a82cd666664ecac500511f4f11b3c1a2c75d58c /gcc
parentee4af2ed0b7322884ec4ff537564683c3749b813 (diff)
downloadgcc-23be9d78f4bcd773ed24818a4b963227536dbff8.zip
gcc-23be9d78f4bcd773ed24818a4b963227536dbff8.tar.gz
gcc-23be9d78f4bcd773ed24818a4b963227536dbff8.tar.bz2
testsuite: don't declare printf in coro.h
mingw stdio.h plays horrible games with extern "C++", but it also seems sloppy for coro.h to declare printf in testcases that will also include standard headers. gcc/testsuite/ChangeLog: * g++.dg/coroutines/coro.h: #include <stdio.h> instead of declaring puts/printf. * g++.dg/coroutines/torture/mid-suspend-destruction-0.C: #include <stdio.h>. * g++.dg/coroutines/pr95599.C: Use PRINT instead of puts. * g++.dg/coroutines/torture/call-00-co-aw-arg.C: * g++.dg/coroutines/torture/call-01-multiple-co-aw.C: * g++.dg/coroutines/torture/call-02-temp-co-aw.C: * g++.dg/coroutines/torture/call-03-temp-ref-co-aw.C: * g++.dg/coroutines/torture/co-await-00-trivial.C: * g++.dg/coroutines/torture/co-await-01-with-value.C: * g++.dg/coroutines/torture/co-await-02-xform.C: * g++.dg/coroutines/torture/co-await-03-rhs-op.C: * g++.dg/coroutines/torture/co-await-04-control-flow.C: * g++.dg/coroutines/torture/co-await-05-loop.C: * g++.dg/coroutines/torture/co-await-06-ovl.C: * g++.dg/coroutines/torture/co-await-07-tmpl.C: * g++.dg/coroutines/torture/co-await-08-cascade.C: * g++.dg/coroutines/torture/co-await-09-pair.C: * g++.dg/coroutines/torture/co-await-11-forwarding.C: * g++.dg/coroutines/torture/co-await-12-operator-2.C: * g++.dg/coroutines/torture/co-await-13-return-ref.C: * g++.dg/coroutines/torture/co-await-14-return-ref-to-auto.C: * g++.dg/coroutines/torture/pr95003.C: Likewise.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/g++.dg/coroutines/coro.h5
-rw-r--r--gcc/testsuite/g++.dg/coroutines/pr95599.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/call-00-co-aw-arg.C4
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/call-01-multiple-co-aw.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/call-02-temp-co-aw.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/call-03-temp-ref-co-aw.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-00-trivial.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-01-with-value.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-02-xform.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-03-rhs-op.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-04-control-flow.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-05-loop.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-06-ovl.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-07-tmpl.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-08-cascade.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-09-pair.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-11-forwarding.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-12-operator-2.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-13-return-ref.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/co-await-14-return-ref-to-auto.C2
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C1
-rw-r--r--gcc/testsuite/g++.dg/coroutines/torture/pr95003.C2
22 files changed, 23 insertions, 25 deletions
diff --git a/gcc/testsuite/g++.dg/coroutines/coro.h b/gcc/testsuite/g++.dg/coroutines/coro.h
index 02d2660..491177f 100644
--- a/gcc/testsuite/g++.dg/coroutines/coro.h
+++ b/gcc/testsuite/g++.dg/coroutines/coro.h
@@ -129,10 +129,6 @@ namespace coro = std;
#endif // __has_include(<experimental/coroutine>)
-/* just to avoid cluttering dump files. */
-extern "C" int puts (const char *);
-extern "C" int printf (const char *, ...);
-
#include <cstdlib> /* for abort () */
#include <utility> /* for std::forward */
@@ -141,6 +137,7 @@ extern "C" int printf (const char *, ...);
# define PRINT(X)
# define PRINTF (void)
#else
+#include <stdio.h>
# define PRINT(X) puts(X)
# define PRINTF printf
#endif
diff --git a/gcc/testsuite/g++.dg/coroutines/pr95599.C b/gcc/testsuite/g++.dg/coroutines/pr95599.C
index 9376359..ec97a4a 100644
--- a/gcc/testsuite/g++.dg/coroutines/pr95599.C
+++ b/gcc/testsuite/g++.dg/coroutines/pr95599.C
@@ -64,6 +64,6 @@ int main ()
PRINTF ("something happened in the wrong order %d, %d, %d, %d, %d, %d, %d\n", a, b, c, d, e, f, g);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/call-00-co-aw-arg.C b/gcc/testsuite/g++.dg/coroutines/torture/call-00-co-aw-arg.C
index ee10807..19e3ec1 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/call-00-co-aw-arg.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/call-00-co-aw-arg.C
@@ -68,6 +68,6 @@ int main ()
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
-} \ No newline at end of file
+}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/call-01-multiple-co-aw.C b/gcc/testsuite/g++.dg/coroutines/torture/call-01-multiple-co-aw.C
index 0f57851..573f4f8 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/call-01-multiple-co-aw.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/call-01-multiple-co-aw.C
@@ -68,6 +68,6 @@ int main ()
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
} \ No newline at end of file
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/call-02-temp-co-aw.C b/gcc/testsuite/g++.dg/coroutines/torture/call-02-temp-co-aw.C
index 4982c49..8ae07aa 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/call-02-temp-co-aw.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/call-02-temp-co-aw.C
@@ -67,6 +67,6 @@ int main ()
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
} \ No newline at end of file
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/call-03-temp-ref-co-aw.C b/gcc/testsuite/g++.dg/coroutines/torture/call-03-temp-ref-co-aw.C
index d0bb466..967cb1b 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/call-03-temp-ref-co-aw.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/call-03-temp-ref-co-aw.C
@@ -67,6 +67,6 @@ int main ()
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
} \ No newline at end of file
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-00-trivial.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-00-trivial.C
index a24c261..6de751a 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-00-trivial.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-00-trivial.C
@@ -47,6 +47,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 11\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-01-with-value.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-01-with-value.C
index db5c902..ddff645 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-01-with-value.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-01-with-value.C
@@ -52,6 +52,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 15\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-02-xform.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-02-xform.C
index 79ee6e1..8d32c73 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-02-xform.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-02-xform.C
@@ -53,6 +53,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 42\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-03-rhs-op.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-03-rhs-op.C
index 6408432..29dcc5f 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-03-rhs-op.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-03-rhs-op.C
@@ -53,6 +53,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 42\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-04-control-flow.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-04-control-flow.C
index e8da2d2..fd201f9 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-04-control-flow.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-04-control-flow.C
@@ -47,6 +47,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 42\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-05-loop.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-05-loop.C
index 34af740..58cdced 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-05-loop.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-05-loop.C
@@ -46,6 +46,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 111\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-06-ovl.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-06-ovl.C
index 14945fa..a3f7fa0 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-06-ovl.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-06-ovl.C
@@ -60,6 +60,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 11\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-07-tmpl.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-07-tmpl.C
index 17dff0d..8915786 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-07-tmpl.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-07-tmpl.C
@@ -127,6 +127,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 42\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-08-cascade.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-08-cascade.C
index d34619d..51eedc5 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-08-cascade.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-08-cascade.C
@@ -58,6 +58,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 14672\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-09-pair.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-09-pair.C
index 525c6fc..e3aba4d 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-09-pair.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-09-pair.C
@@ -52,6 +52,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 57\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-11-forwarding.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-11-forwarding.C
index 78c88ed..6e59c88 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-11-forwarding.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-11-forwarding.C
@@ -38,6 +38,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 15\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-12-operator-2.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-12-operator-2.C
index 189332b..91dd192 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-12-operator-2.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-12-operator-2.C
@@ -61,6 +61,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 14\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-13-return-ref.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-13-return-ref.C
index 339ebe4..78f2d5b 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-13-return-ref.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-13-return-ref.C
@@ -53,6 +53,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 15\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-await-14-return-ref-to-auto.C b/gcc/testsuite/g++.dg/coroutines/torture/co-await-14-return-ref-to-auto.C
index 0a7c035..6b1d5bf 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/co-await-14-return-ref-to-auto.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/co-await-14-return-ref-to-auto.C
@@ -40,6 +40,6 @@ int main ()
PRINT ("main: we should be 'done' ");
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C b/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C
index 63561ea..0cbf93a 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/mid-suspend-destruction-0.C
@@ -8,6 +8,7 @@
// go out of scope.
#include "../coro.h"
+#include <stdio.h>
struct coro1 {
struct promise_type;
diff --git a/gcc/testsuite/g++.dg/coroutines/torture/pr95003.C b/gcc/testsuite/g++.dg/coroutines/torture/pr95003.C
index eda7858..9022dd2 100644
--- a/gcc/testsuite/g++.dg/coroutines/torture/pr95003.C
+++ b/gcc/testsuite/g++.dg/coroutines/torture/pr95003.C
@@ -45,6 +45,6 @@ int main ()
PRINTF ("main: y is wrong : %d, should be 100\n", y);
abort ();
}
- puts ("main: done");
+ PRINT ("main: done");
return 0;
}