@@ -31,12 +31,12 @@ test!(custom_build_script_failed {
31
31
. with_stdout( format!( "\
32
32
{compiling} foo v0.5.0 ({url})
33
33
{running} `rustc build.rs --crate-name build-script-build --crate-type bin [..]`
34
- {running} `[..]build-script-build`
34
+ {running} `[..]build-script-build[..] `
35
35
" ,
36
36
url = p. url( ) , compiling = COMPILING , running = RUNNING ) )
37
37
. with_stderr( format!( "\
38
38
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)" ,
40
40
p. url( ) ) ) ) ;
41
41
} )
42
42
@@ -292,7 +292,7 @@ test!(overrides_and_links {
292
292
{running} `rustc build.rs [..]`
293
293
{compiling} a v0.5.0 (file://[..])
294
294
{running} `rustc [..] --crate-name a [..]`
295
- {running} `[..]build-script-build`
295
+ {running} `[..]build-script-build[..] `
296
296
{running} `rustc [..] --crate-name foo [..] -L foo -L bar[..]`
297
297
" , compiling = COMPILING , running = RUNNING ) . as_slice( ) ) ) ;
298
298
} )
@@ -371,7 +371,7 @@ test!(only_rerun_build_script {
371
371
execs( ) . with_status( 0 )
372
372
. with_stdout( format!( "\
373
373
{compiling} foo v0.5.0 (file://[..])
374
- {running} `[..]build-script-build`
374
+ {running} `[..]build-script-build[..] `
375
375
{running} `rustc [..] --crate-name foo [..]`
376
376
" , compiling = COMPILING , running = RUNNING ) . as_slice( ) ) ) ;
377
377
} )
@@ -444,13 +444,13 @@ test!(testing_and_such {
444
444
execs( ) . with_status( 0 ) ) ;
445
445
p. root( ) . move_into_the_past( ) . unwrap( ) ;
446
446
447
- File :: create( & p. root( ) . join( "file1 " ) ) . unwrap( ) ;
447
+ File :: create( & p. root( ) . join( "src/lib.rs " ) ) . unwrap( ) ;
448
448
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 " ) ,
450
450
execs( ) . with_status( 0 )
451
451
. with_stdout( format!( "\
452
452
{compiling} foo v0.5.0 (file://[..])
453
- {running} `[..]build-script-build`
453
+ {running} `[..]build-script-build[..] `
454
454
{running} `rustc [..] --crate-name foo [..]`
455
455
{running} `rustc [..] --test [..]`
456
456
{running} `[..]foo-[..]`
@@ -536,7 +536,7 @@ test!(propagation_of_l_flags {
536
536
{running} `rustc build.rs [..]`
537
537
{compiling} b v0.5.0 (file://[..])
538
538
{running} `rustc [..] --crate-name b [..]-L foo[..]`
539
- {running} `[..]a-[..]build-script-build`
539
+ {running} `[..]a-[..]build-script-build[..] `
540
540
{running} `rustc [..] --crate-name a [..]-L bar[..]-L foo[..]`
541
541
{compiling} foo v0.5.0 (file://[..])
542
542
{running} `rustc [..] --crate-name foo [..] -L bar[..]-L foo[..]`
@@ -574,7 +574,7 @@ test!(build_deps_simple {
574
574
{running} `rustc [..] --crate-name a [..]`
575
575
{compiling} foo v0.5.0 (file://[..])
576
576
{running} `rustc build.rs [..] --extern a=[..]`
577
- {running} `[..]foo-[..]build-script-build`
577
+ {running} `[..]foo-[..]build-script-build[..] `
578
578
{running} `rustc [..] --crate-name foo [..]`
579
579
" , compiling = COMPILING , running = RUNNING ) . as_slice( ) ) ) ;
580
580
} )
@@ -662,7 +662,7 @@ test!(build_cmd_with_a_build_cmd {
662
662
{running} `rustc [..] --crate-name b [..]`
663
663
{compiling} a v0.5.0 (file://[..])
664
664
{running} `rustc build.rs [..] --extern b=[..]`
665
- {running} `[..]a-[..]build-script-build`
665
+ {running} `[..]a-[..]build-script-build[..] `
666
666
{running} `rustc [..]lib.rs --crate-name a --crate-type lib -g \
667
667
-C metadata=[..] -C extra-filename=-[..] \
668
668
--out-dir [..]target[..]deps --dep-info [..]fingerprint[..]dep-lib-a \
@@ -673,7 +673,7 @@ test!(build_cmd_with_a_build_cmd {
673
673
--out-dir [..]build[..]foo-[..] --dep-info [..]fingerprint[..]dep-[..] \
674
674
-L [..]target -L [..]target[..]deps \
675
675
--extern a=[..]liba-[..].rlib`
676
- {running} `[..]foo-[..]build-script-build`
676
+ {running} `[..]foo-[..]build-script-build[..] `
677
677
{running} `rustc [..]lib.rs --crate-name foo --crate-type lib -g \
678
678
-C metadata=[..] -C extra-filename=-[..] \
679
679
--out-dir [..]target --dep-info [..]fingerprint[..]dep-lib-foo \
@@ -749,7 +749,7 @@ test!(output_separate_lines {
749
749
. with_stdout( format!( "\
750
750
{compiling} foo v0.5.0 (file://[..])
751
751
{running} `rustc build.rs [..]`
752
- {running} `[..]foo-[..]build-script-build`
752
+ {running} `[..]foo-[..]build-script-build[..] `
753
753
{running} `rustc [..] --crate-name foo [..] -L foo -l foo:static`
754
754
" , compiling = COMPILING , running = RUNNING ) . as_slice( ) ) ) ;
755
755
} )
0 commit comments