From bc47ace0ec97ef1b3498c17ff03e2ee873743d5c Mon Sep 17 00:00:00 2001
From: CohenArthur <cohenarthur.dev@gmail.com>
Date: Tue, 25 Jan 2022 13:59:06 +0100
Subject: selftest: Move C specific tests in c_family_test()

---
 gcc/c-family/c-common.cc  | 2 ++
 gcc/c-family/c-common.h   | 2 ++
 gcc/diagnostic.cc         | 2 +-
 gcc/opt-problem.cc        | 2 +-
 gcc/selftest-run-tests.cc | 2 --
 gcc/selftest.h            | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'gcc')

diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
index d9674ea..d02016e 100644
--- a/gcc/c-family/c-common.cc
+++ b/gcc/c-family/c-common.cc
@@ -9111,6 +9111,8 @@ c_family_tests (void)
   c_indentation_c_tests ();
   c_pretty_print_c_tests ();
   c_spellcheck_cc_tests ();
+  c_diagnostic_c_tests ();
+  c_opt_problem_cc_tests ();
 }
 
 } // namespace selftest
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index ee0c4de..817e1b6 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -1512,8 +1512,10 @@ extern tree braced_lists_to_strings (tree, tree);
 namespace selftest {
   /* Declarations for specific families of tests within c-family,
      by source file, in alphabetical order.  */
+  extern void c_diagnostic_c_tests (void);
   extern void c_format_c_tests (void);
   extern void c_indentation_c_tests (void);
+  extern void c_opt_problem_cc_tests (void);
   extern void c_pretty_print_c_tests (void);
   extern void c_spellcheck_cc_tests (void);
 
diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc
index 97e2e2c..9c2f445 100644
--- a/gcc/diagnostic.cc
+++ b/gcc/diagnostic.cc
@@ -2466,7 +2466,7 @@ test_num_digits ()
 /* Run all of the selftests within this file.  */
 
 void
-diagnostic_c_tests ()
+c_diagnostic_c_tests ()
 {
   test_print_escaped_string ();
   test_print_parseable_fixits_none ();
diff --git a/gcc/opt-problem.cc b/gcc/opt-problem.cc
index e45d14e..11fec57 100644
--- a/gcc/opt-problem.cc
+++ b/gcc/opt-problem.cc
@@ -324,7 +324,7 @@ test_opt_result_failure_at (const line_table_case &case_)
 /* Run all of the selftests within this file.  */
 
 void
-opt_problem_cc_tests ()
+c_opt_problem_cc_tests ()
 {
   test_opt_result_success ();
   for_each_line_table_case (test_opt_result_failure_at);
diff --git a/gcc/selftest-run-tests.cc b/gcc/selftest-run-tests.cc
index 4123e54..0c5bf4c 100644
--- a/gcc/selftest-run-tests.cc
+++ b/gcc/selftest-run-tests.cc
@@ -76,7 +76,6 @@ selftest::run_tests ()
   json_cc_tests ();
   cgraph_c_tests ();
   optinfo_emit_json_cc_tests ();
-  opt_problem_cc_tests ();
   ordered_hash_map_tests_cc_tests ();
   splay_tree_cc_tests ();
 
@@ -95,7 +94,6 @@ selftest::run_tests ()
   /* Higher-level tests, or for components that other selftests don't
      rely on.  */
   diagnostic_show_locus_c_tests ();
-  diagnostic_c_tests ();
   diagnostic_format_json_cc_tests ();
   edit_context_c_tests ();
   fold_const_c_tests ();
diff --git a/gcc/selftest.h b/gcc/selftest.h
index 386c0d9..6d62461 100644
--- a/gcc/selftest.h
+++ b/gcc/selftest.h
@@ -238,7 +238,6 @@ extern void hash_map_tests_c_tests ();
 extern void hash_set_tests_c_tests ();
 extern void input_c_tests ();
 extern void json_cc_tests ();
-extern void opt_problem_cc_tests ();
 extern void optinfo_emit_json_cc_tests ();
 extern void opts_c_tests ();
 extern void ordered_hash_map_tests_cc_tests ();
-- 
cgit v1.1