From patchwork Wed Feb 16 10:44:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 51156 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A5C6F3858437 for ; Wed, 16 Feb 2022 10:44:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 4E1F63858408 for ; Wed, 16 Feb 2022 10:44:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4E1F63858408 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x42d.google.com with SMTP id d27so2732846wrb.5 for ; Wed, 16 Feb 2022 02:44:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=message-id:date:mime-version:user-agent:content-language:to:from :subject:autocrypt; bh=Ps38/XgkTLyFcgvFQTFd5K0IykV8KBQ1yJ1FnpbmUkg=; b=hGOPVDNb8IgKhEB6pqw5SeySDemnJDtas6szLbUTnhuGWTsVwi9cwWRh1kWfgopK1e 8JoSRwa3nbmNj2ZtH/DuWmfrX04WwTvdTazgXsdgvZKqi2ctvODOIL2i/aUwsAGtXo4z 2w4NpLknvqnyjN3RHHhXl8Ixj8cBYiSW/uuJjXPp6yhFeUeE6/BoQhwG0O0gE8UuAjcg jvnMdQUfUXdTmHpNTm6kJUgJLu0oBM4z6Bd1UVT1Or4vewq60gWyWNpGLiuuLWVE0XE3 iKEi2I5DLoQAsWN20mzldJ/0KxreUakA2LKFIJ+EsMP0e2IX9tCJQaaRdCc3YbAfU3hz TXVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:from:subject:autocrypt; bh=Ps38/XgkTLyFcgvFQTFd5K0IykV8KBQ1yJ1FnpbmUkg=; b=bXr9e/6oTwhKGrcQ2feUMwAbKqCaeDxwNZmGRZiMfk9fQTtIgr49XAHqDGc7cSYD+v mric6vvqIlH+E2AW5p9RMyrjFKlSGv78yWOFbaZehlxLwFz+U1FodiH0NpEuSWIzVGCw 3Md4Jfo9OeVISHl41sxJ5xT24CjbIQ/W41ToO6S+febk4ACXfTIHagFRKuP5phI59kXS wInIhaMtyoBI3lye1aQHvc1YekOSRVRaTU/DGzptbxxLs1+1aYKoAjOaEcqspz6cq08g fPTmMBoAslx0RQtrvRY1ow3XQTOpS+HgzXC3AAeBUCf4H1W1jVkRHX2JdIpP//4BlVO8 gMiA== X-Gm-Message-State: AOAM530glS3Wxk7b56jC7KePIDK/QzlRH8ow2QL/xsXOmD06W5HH/TDf ky/hlZhF3j0PRYUTZ727vEStH3M7HzdBH0/TDA== X-Google-Smtp-Source: ABdhPJyUdQV86OZs25Ef4fbutl05EwikhduAvPlTdsYkGAFjuBXzFbM7rpOyIcH8hGFz1aLpRttWUQ== X-Received: by 2002:a5d:6082:0:b0:1e3:4f7:e0df with SMTP id w2-20020a5d6082000000b001e304f7e0dfmr1868667wrt.435.1645008263805; Wed, 16 Feb 2022 02:44:23 -0800 (PST) Received: from [192.168.15.252] ([62.96.0.6]) by smtp.gmail.com with ESMTPSA id s7sm6114671wro.104.2022.02.16.02.44.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Feb 2022 02:44:23 -0800 (PST) Message-ID: Date: Wed, 16 Feb 2022 11:44:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Content-Language: en-US To: gcc-patches@gcc.gnu.org From: Arthur Cohen Subject: [PATCH] selftest: Move C-specific tests to c_family Autocrypt: addr=arthur.cohen@embecosm.com; keydata= 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 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" When trying to make use of the selftest framework over on the rust frontend, we ran into issues where rust1 was expected to produce errors containing C-like type names such as `int`. I had gotten in contact with David Malcolm on the gcc mailing list [1], who advised moving some test functions to a better location. The offending functions have also been renamed in order to better fit the C family of tests, and are thus not called when performing general selftests anymore. Kindly, [1]: https://gcc.gnu.org/pipermail/gcc/2021-November/237703.html 2022-02-16 Arthur Cohen * diagnostic.cc (diagnostic_cc_tests): Rename to... (c_diagnostic_cc_tests): ...this. * opt_problem.cc (opt_problem_cc_tests): Rename to... (c_opt_problem_cc_tests): ...this. --- 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 | 2 -- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc index 7203d761df1..d034837bb5b 100644 --- a/gcc/c-family/c-common.cc +++ b/gcc/c-family/c-common.cc @@ -9120,6 +9120,8 @@ c_family_tests (void) c_indentation_cc_tests (); c_pretty_print_cc_tests (); c_spellcheck_cc_tests (); + c_diagnostic_cc_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 a8d6f82bb2c..ed20c5837be 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -1513,8 +1513,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_cc_tests (void); extern void c_format_cc_tests (void); extern void c_indentation_cc_tests (void); + extern void c_opt_problem_cc_tests (void); extern void c_pretty_print_cc_tests (void); extern void c_spellcheck_cc_tests (void); diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc index 87eb473d2f3..73324a728fe 100644 --- a/gcc/diagnostic.cc +++ b/gcc/diagnostic.cc @@ -2472,7 +2472,7 @@ test_num_digits () /* Run all of the selftests within this file. */ void -diagnostic_cc_tests () +c_diagnostic_cc_tests () { test_print_escaped_string (); test_print_parseable_fixits_none (); diff --git a/gcc/opt-problem.cc b/gcc/opt-problem.cc index e45d14e94b6..11fec57d679 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 99c35423253..d59e0aeddee 100644 --- a/gcc/selftest-run-tests.cc +++ b/gcc/selftest-run-tests.cc @@ -76,7 +76,6 @@ selftest::run_tests () json_cc_tests (); cgraph_cc_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_cc_tests (); - diagnostic_cc_tests (); diagnostic_format_json_cc_tests (); edit_context_cc_tests (); fold_const_cc_tests (); diff --git a/gcc/selftest.h b/gcc/selftest.h index 7a715631c62..7568a6d24d4 100644 --- a/gcc/selftest.h +++ b/gcc/selftest.h @@ -222,7 +222,6 @@ extern void attribs_cc_tests (); extern void bitmap_cc_tests (); extern void cgraph_cc_tests (); extern void convert_cc_tests (); -extern void diagnostic_cc_tests (); extern void diagnostic_format_json_cc_tests (); extern void diagnostic_show_locus_cc_tests (); extern void digraph_cc_tests (); @@ -238,7 +237,6 @@ extern void hash_map_tests_cc_tests (); extern void hash_set_tests_cc_tests (); extern void input_cc_tests (); extern void json_cc_tests (); -extern void opt_problem_cc_tests (); extern void optinfo_emit_json_cc_tests (); extern void opts_cc_tests (); extern void ordered_hash_map_tests_cc_tests ();