add test, improvements following review

Author: boozook

compiler/rustc_session/src/config.rs

@@ -19,8 +19,8 @@ use rustc_macros::{Decodable, Encodable, HashStable_Generic};
 use rustc_span::edition::{Edition, DEFAULT_EDITION, EDITION_NAME_LIST, LATEST_STABLE_EDITION};
 use rustc_span::source_map::FilePathMapping;
 use rustc_span::{FileName, FileNameDisplayPreference, RealFileName, SourceFileHashAlgorithm};
+use rustc_target::spec::{has_ext_ignore_case, SplitDebuginfo, Target, TargetTriple};
 use rustc_target::spec::{FramePointer, LinkSelfContainedComponents, LinkerFeatures};
-use rustc_target::spec::{SplitDebuginfo, Target, TargetTriple};
 use std::collections::btree_map::{
     Iter as BTreeMapIter, Keys as BTreeMapKeysIter, Values as BTreeMapValuesIter,
 };
@@ -1991,7 +1991,7 @@ fn collect_print_requests(
 
 pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> TargetTriple {
     match matches.opt_str("target") {
-        Some(target) if TargetTriple::has_json_ext(&target) => {
+        Some(target) if has_ext_ignore_case(&target, "json") => {
             let path = Path::new(&target);
             TargetTriple::from_path(path).unwrap_or_else(|_| {
                 early_dcx.early_fatal(format!("target file {path:?} does not exist"))

compiler/rustc_target/src/spec/mod.rs

@@ -46,6 +46,7 @@ use rustc_span::symbol::{kw, sym, Symbol};
 use serde_json::Value;
 use std::borrow::Cow;
 use std::collections::BTreeMap;
+use std::ffi::OsStr;
 use std::hash::{Hash, Hasher};
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};
@@ -3709,22 +3710,18 @@ impl TargetTriple {
             }
         }
     }
-
-    /// Helper function to check if the given `triple` ends with `".json"` __case-insensitive__.
-    /// Does not check if the path exists.
-    pub fn has_json_ext<S: AsRef<str>>(triple: S) -> bool {
-        const EXT: &'static str = ".json";
-        triple.as_ref().ends_with(EXT) || {
-            let s = triple.as_ref();
-            s.get(s.len().wrapping_sub(EXT.len())..)
-                .map(|ext| ext.eq_ignore_ascii_case(EXT))
-                .unwrap_or_default()
-        }
-    }
 }
 
 impl fmt::Display for TargetTriple {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.debug_triple())
     }
 }
+
+/// Helper function to check if the given `s` ends with `ext` __case-insensitive__.
+/// The `ext` should not starts with a dot.
+///
+/// Does not check if the path exists.
+pub fn has_ext_ignore_case<S: AsRef<OsStr>, Ext: AsRef<OsStr>>(s: S, ext: Ext) -> bool {
+    Path::new(&s).extension().is_some_and(|s| s.eq_ignore_ascii_case(ext))
+}

tests/run-make/target-specs-filename/ALL-IN-CAPS.JSON

@@ -0,0 +1,6 @@
+{
+  "arch": "x86_64",
+  "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+  "llvm-target": "x86_64-unknown-unknown-gnu",
+  "target-pointer-width": "64"
+}

tests/run-make/target-specs-filename/ext-in-caps.JSON

@@ -0,0 +1,6 @@
+{
+  "arch": "x86_64",
+  "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+  "llvm-target": "x86_64-unknown-unknown-gnu",
+  "target-pointer-width": "64"
+}

tests/run-make/target-specs-filename/normal-target-triple.json

@@ -0,0 +1,6 @@
+{
+  "arch": "x86_64",
+  "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
+  "llvm-target": "x86_64-unknown-unknown-gnu",
+  "target-pointer-width": "64"
+}

tests/run-make/target-specs-filename/rmake.rs

@@ -0,0 +1,25 @@
+// This test checks the rustc can accept target-spec-json with cases
+// including file extension - it could be in upper and lower case.
+// Used to test: print target-spec-json and cfg
+// Issue: https://github.com/rust-lang/rust/issues/127387
+
+///@ ignore-cross-compile
+use run_make_support::rustc;
+
+fn main() {
+    // This is a matrix [files x args], files for target, args for print.
+    for file in [
+        "normal-target-triple",
+        "normal-target-triple.json",
+        "ext-in-caps.JSON",
+        "ALL-IN-CAPS.JSON",
+    ] {
+        for args in [["cfg"].as_slice(), &["target-spec-json", "-Zunstable-options"]] {
+            let output = rustc().arg("--print").args(args).args(["--target", file]).run();
+            // check that the target triple is accepted without failures
+            assert!(output.status().success(), "target triple doesn't accepted");
+            // check that the target triple is read correctly
+            output.assert_stdout_contains("x86_64");
+        }
+    }
+}