|
298 | 298 | run_test(\&test_vcf_view,$opts,in=>'weird-chr-names',out=>'weird-chr-names.5.out',args=>'',reg=>'-r {1:1-1}:1-2'); |
299 | 299 | run_test(\&test_vcf_view,$opts,in=>'weird-chr-names',out=>'weird-chr-names.5.out',args=>'',reg=>'-r {1:1-1}:1,{1:1-1}:2'); |
300 | 300 | run_test(\&test_vcf_view,$opts,in=>'weird-chr-names',out=>'weird-chr-names.6.out',args=>'',reg=>'-r {1:1-1}:1-1'); |
| 301 | +run_test(\&test_vcf_view,$opts,in=>'weird-chr-names',args=>'',reg=>'-r {1:1-1}-2',expected_failure=>1); |
301 | 302 | run_test(\&test_vcf_view,$opts,in=>'view',out=>'view.1.out',args=>'-aUc1 -C1 -s NA00002 -v snps',reg=>''); |
302 | 303 | run_test(\&test_vcf_view,$opts,in=>'view',out=>'view.2.out',args=>'-f PASS -Xks NA00003',reg=>'-r20,Y'); |
303 | 304 | run_test(\&test_vcf_view,$opts,in=>'view',out=>'view.3.out',args=>'-xs NA00003',reg=>''); |
@@ -1083,7 +1084,13 @@ sub test_cmd |
1083 | 1084 |
|
1084 | 1085 | my ($ret,$out,$err) = _cmd3("$args{cmd}"); |
1085 | 1086 | if ( length($err) ) { $err =~ s/\n/\n\t\t/gs; $err = "\n\n\t\t$err\n"; } |
1086 | | - if ( $ret ) { failed($opts,$test,"Non-zero status $ret$err"); return; } |
| 1087 | + if ( $ret && !$args{expected_failure} ) { failed($opts,$test,"Non-zero status $ret$err"); return; } |
| 1088 | + if ( $args{expected_failure} ) |
| 1089 | + { |
| 1090 | + if ( !$ret ) { failed($opts,$test,"Expected failure but the test returned $ret$err"); } |
| 1091 | + else { passed($opts,$test,"ok, expected non-zero status"); } |
| 1092 | + return; |
| 1093 | + } |
1087 | 1094 | if ( $$opts{redo_outputs} && -e "$$opts{path}/$args{out}" ) |
1088 | 1095 | { |
1089 | 1096 | rename("$$opts{path}/$args{out}","$$opts{path}/$args{out}.old"); |
@@ -1155,9 +1162,10 @@ sub failed |
1155 | 1162 | } |
1156 | 1163 | sub passed |
1157 | 1164 | { |
1158 | | - my ($opts,$test) = @_; |
| 1165 | + my ($opts,$test,$reason) = @_; |
1159 | 1166 | $$opts{nok}++; |
1160 | | - print ".. ok\n\n"; |
| 1167 | + if ( !defined $reason ) { $reason = 'ok'; } |
| 1168 | + print ".. $reason\n\n"; |
1161 | 1169 | } |
1162 | 1170 | sub is_file_newer |
1163 | 1171 | { |
|
0 commit comments