Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/compiler/msvc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,9 @@ pub fn parse_arguments(
Some(o) => {
if o.as_os_str()
.to_string_lossy()
.ends_with(std::path::MAIN_SEPARATOR)
// On Windows, both '\' and '/' are valid path separators
// and accepted by `cl.exe` as a delimiter
.ends_with(['\\', '/'])
{
match Path::new(&input).file_name() {
Some(i) => outputs.insert(
Expand Down Expand Up @@ -1903,6 +1905,39 @@ mod test {
assert!(!msvc_show_includes);
}

#[test]
#[cfg(windows)]
fn parse_argument_output_file_trailing_slash_multi_extension() {
let args = ovec!["/c", "foo.pb.c", "-Fomyrelease\\folder/"];
let ParsedArguments {
input,
language,
outputs,
preprocessor_args,
msvc_show_includes,
common_args,
..
} = match parse_arguments(args) {
CompilerArguments::Ok(args) => args,
o => panic!("Got unexpected parse result: {:?}", o),
};
assert_eq!(Some("foo.pb.c"), input.to_str());
assert_eq!(Language::C, language);
assert_map_contains!(
outputs,
(
"obj",
ArtifactDescriptor {
path: PathBuf::from("myrelease/folder/foo.pb.obj"),
optional: false
}
)
);
assert!(preprocessor_args.is_empty());
assert!(common_args.is_empty());
assert!(!msvc_show_includes);
}

#[test]
fn test_parse_arguments_pdb() {
let args = ovec!["-c", "foo.c", "-Zi", "-Fdfoo.pdb", "-Fofoo.obj"];
Expand Down
Loading