@@ -24,32 +24,40 @@ sub _evaluateRet {
24
24
if ($retCheck -> {type } eq ' okCode' ) {
25
25
foreach (@{$retCheck -> {values }}) {
26
26
if ($exitStatus == $_ ) {
27
- return [ 1, " exit status is ok : $_ " ];
27
+ return [ 1, " ok, got expected exit status : $_ " ];
28
28
}
29
29
}
30
+ return [ 0, " not expected exit status: $exitStatus " ];
31
+
30
32
} elsif ($retCheck -> {type } eq ' okPattern' ) {
31
33
foreach (@{$retCheck -> {values }}) {
32
34
next unless length ($_ );
33
35
if ($$buf =~ / $_ / ) {
34
- return [ 1, " ok pattern found in log: /$_ /" ];
36
+ return [ 1, " ok, pattern found in log: /$_ /" ];
35
37
}
36
38
}
39
+ return [ 0, " expected pattern not found in log" ];
40
+
37
41
} elsif ($retCheck -> {type } eq ' errorCode' ) {
38
42
foreach (@{$retCheck -> {values }}) {
39
43
if ($exitStatus == $_ ) {
40
- return [ 0, " exit status is not ok: ` $_ ' " ];
44
+ return [ 0, " found unwanted exit status: $exitStatus " ];
41
45
}
42
46
}
47
+ return [ 1, " ok, not an unwanted exit status: $exitStatus " ];
48
+
43
49
} elsif ($retCheck -> {type } eq ' errorPattern' ) {
44
50
foreach (@{$retCheck -> {values }}) {
45
51
next unless length ($_ );
46
52
if ($$buf =~ / $_ / ) {
47
53
return [ 0, " error pattern found in log: /$_ /" ];
48
54
}
49
55
}
56
+ return [ 1, " ok, error pattern not found in log" ];
50
57
}
51
58
}
52
- return [ 0, ' ' ];
59
+
60
+ return [ 1, " nothing to check" ];
53
61
}
54
62
55
63
sub _runOnUnix {
0 commit comments