Skip to content

Commit 5e29a8b

Browse files
committed
Fix custom build tests on windows
1 parent c05442a commit 5e29a8b

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tests/test_cargo_compile_custom_build.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ test!(custom_build_script_failed {
3131
.with_stdout(format!("\
3232
{compiling} foo v0.5.0 ({url})
3333
{running} `rustc build.rs --crate-name build-script-build --crate-type bin [..]`
34-
{running} `[..]build-script-build`
34+
{running} `[..]build-script-build[..]`
3535
",
3636
url = p.url(), compiling = COMPILING, running = RUNNING))
3737
.with_stderr(format!("\
3838
Failed to run custom build command for `foo v0.5.0 ({})`
39-
Process didn't exit successfully: `[..]build[..]build-script-build` (status=101)",
39+
Process didn't exit successfully: `[..]build[..]build-script-build[..]` (status=101)",
4040
p.url())));
4141
})
4242

@@ -292,7 +292,7 @@ test!(overrides_and_links {
292292
{running} `rustc build.rs [..]`
293293
{compiling} a v0.5.0 (file://[..])
294294
{running} `rustc [..] --crate-name a [..]`
295-
{running} `[..]build-script-build`
295+
{running} `[..]build-script-build[..]`
296296
{running} `rustc [..] --crate-name foo [..] -L foo -L bar[..]`
297297
", compiling = COMPILING, running = RUNNING).as_slice()));
298298
})
@@ -371,7 +371,7 @@ test!(only_rerun_build_script {
371371
execs().with_status(0)
372372
.with_stdout(format!("\
373373
{compiling} foo v0.5.0 (file://[..])
374-
{running} `[..]build-script-build`
374+
{running} `[..]build-script-build[..]`
375375
{running} `rustc [..] --crate-name foo [..]`
376376
", compiling = COMPILING, running = RUNNING).as_slice()));
377377
})
@@ -444,13 +444,13 @@ test!(testing_and_such {
444444
execs().with_status(0));
445445
p.root().move_into_the_past().unwrap();
446446

447-
File::create(&p.root().join("file1")).unwrap();
447+
File::create(&p.root().join("src/lib.rs")).unwrap();
448448

449-
assert_that(p.process(cargo_dir().join("cargo")).arg("test").arg("-v"),
449+
assert_that(p.process(cargo_dir().join("cargo")).arg("test").arg("-vj1"),
450450
execs().with_status(0)
451451
.with_stdout(format!("\
452452
{compiling} foo v0.5.0 (file://[..])
453-
{running} `[..]build-script-build`
453+
{running} `[..]build-script-build[..]`
454454
{running} `rustc [..] --crate-name foo [..]`
455455
{running} `rustc [..] --test [..]`
456456
{running} `[..]foo-[..]`
@@ -536,7 +536,7 @@ test!(propagation_of_l_flags {
536536
{running} `rustc build.rs [..]`
537537
{compiling} b v0.5.0 (file://[..])
538538
{running} `rustc [..] --crate-name b [..]-L foo[..]`
539-
{running} `[..]a-[..]build-script-build`
539+
{running} `[..]a-[..]build-script-build[..]`
540540
{running} `rustc [..] --crate-name a [..]-L bar[..]-L foo[..]`
541541
{compiling} foo v0.5.0 (file://[..])
542542
{running} `rustc [..] --crate-name foo [..] -L bar[..]-L foo[..]`
@@ -574,7 +574,7 @@ test!(build_deps_simple {
574574
{running} `rustc [..] --crate-name a [..]`
575575
{compiling} foo v0.5.0 (file://[..])
576576
{running} `rustc build.rs [..] --extern a=[..]`
577-
{running} `[..]foo-[..]build-script-build`
577+
{running} `[..]foo-[..]build-script-build[..]`
578578
{running} `rustc [..] --crate-name foo [..]`
579579
", compiling = COMPILING, running = RUNNING).as_slice()));
580580
})
@@ -662,7 +662,7 @@ test!(build_cmd_with_a_build_cmd {
662662
{running} `rustc [..] --crate-name b [..]`
663663
{compiling} a v0.5.0 (file://[..])
664664
{running} `rustc build.rs [..] --extern b=[..]`
665-
{running} `[..]a-[..]build-script-build`
665+
{running} `[..]a-[..]build-script-build[..]`
666666
{running} `rustc [..]lib.rs --crate-name a --crate-type lib -g \
667667
-C metadata=[..] -C extra-filename=-[..] \
668668
--out-dir [..]target[..]deps --dep-info [..]fingerprint[..]dep-lib-a \
@@ -673,7 +673,7 @@ test!(build_cmd_with_a_build_cmd {
673673
--out-dir [..]build[..]foo-[..] --dep-info [..]fingerprint[..]dep-[..] \
674674
-L [..]target -L [..]target[..]deps \
675675
--extern a=[..]liba-[..].rlib`
676-
{running} `[..]foo-[..]build-script-build`
676+
{running} `[..]foo-[..]build-script-build[..]`
677677
{running} `rustc [..]lib.rs --crate-name foo --crate-type lib -g \
678678
-C metadata=[..] -C extra-filename=-[..] \
679679
--out-dir [..]target --dep-info [..]fingerprint[..]dep-lib-foo \
@@ -749,7 +749,7 @@ test!(output_separate_lines {
749749
.with_stdout(format!("\
750750
{compiling} foo v0.5.0 (file://[..])
751751
{running} `rustc build.rs [..]`
752-
{running} `[..]foo-[..]build-script-build`
752+
{running} `[..]foo-[..]build-script-build[..]`
753753
{running} `rustc [..] --crate-name foo [..] -L foo -l foo:static`
754754
", compiling = COMPILING, running = RUNNING).as_slice()));
755755
})

0 commit comments

Comments
 (0)