@@ -614,21 +614,39 @@ fn no_helper_deadlock() {
614
614
#[ test]
615
615
fn test_find_jobserver_auth ( ) {
616
616
let cases = [
617
- ( "--jobserver-auth=auth-a --jobserver-auth=auth-b" , "auth-b" ) ,
618
- ( "--jobserver-auth=auth-b --jobserver-auth=auth-a" , "auth-a" ) ,
619
- ( "--jobserver-fds=fds-a --jobserver-fds=fds-b" , "fds-b" ) ,
620
- ( "--jobserver-fds=fds-b --jobserver-fds=fds-a" , "fds-a" ) ,
617
+ ( "" , None ) ,
618
+ ( "-j2" , None ) ,
619
+ ( "-j2 --jobserver-auth=3,4" , Some ( "3,4" ) ) ,
620
+ ( "--jobserver-auth=3,4 -j2" , Some ( "3,4" ) ) ,
621
+ ( "--jobserver-auth=3,4" , Some ( "3,4" ) ) ,
622
+ ( "--jobserver-auth=fifo:/myfifo" , Some ( "fifo:/myfifo" ) ) ,
623
+ ( "--jobserver-auth=" , Some ( "" ) ) ,
624
+ ( "--jobserver-auth" , None ) ,
625
+ ( "--jobserver-fds=3,4" , Some ( "3,4" ) ) ,
626
+ ( "--jobserver-fds=fifo:/myfifo" , Some ( "fifo:/myfifo" ) ) ,
627
+ ( "--jobserver-fds=" , Some ( "" ) ) ,
628
+ ( "--jobserver-fds" , None ) ,
629
+ (
630
+ "--jobserver-auth=auth-a --jobserver-auth=auth-b" ,
631
+ Some ( "auth-b" ) ,
632
+ ) ,
633
+ (
634
+ "--jobserver-auth=auth-b --jobserver-auth=auth-a" ,
635
+ Some ( "auth-a" ) ,
636
+ ) ,
637
+ ( "--jobserver-fds=fds-a --jobserver-fds=fds-b" , Some ( "fds-b" ) ) ,
638
+ ( "--jobserver-fds=fds-b --jobserver-fds=fds-a" , Some ( "fds-a" ) ) ,
621
639
(
622
640
"--jobserver-auth=auth-a --jobserver-fds=fds-a --jobserver-auth=auth-b" ,
623
- "auth-b" ,
641
+ Some ( "auth-b" ) ,
624
642
) ,
625
643
(
626
644
"--jobserver-fds=fds-a --jobserver-auth=auth-a --jobserver-fds=fds-b" ,
627
- "auth-a" ,
645
+ Some ( "auth-a" ) ,
628
646
) ,
629
647
] ;
630
648
for ( var, expected) in cases {
631
- let actual = find_jobserver_auth ( var) . unwrap ( ) ;
649
+ let actual = find_jobserver_auth ( var) ;
632
650
assert_eq ! (
633
651
actual, expected,
634
652
"expect {expected:?}, got {actual:?}, input `{var:?}`"
0 commit comments