Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/checkpoint-restore/criu.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYounes Manton <ymanton@ca.ibm.com>2022-09-27 17:10:03 +0300
committerAndrei Vagin <avagin@gmail.com>2022-10-02 08:42:48 +0300
commit50dda158f6cd49ed041b128278edd54724beba96 (patch)
treeaa639f18414b39564bd092456adeaedd83923b9f
parent6e9a908af9b515e85895354c4dac312c8da52184 (diff)
compel: Fix infect test to not override failures
Signed-off-by: Younes Manton <ymanton@ca.ibm.com> return zero on chk success Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> Co-authored-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
-rw-r--r--compel/test/infect/spy.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index e7273b446..b10db4d47 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -94,15 +94,15 @@ static inline int chk(int fd, int val)
int v = 0;
if (read(fd, &v, sizeof(v)) != sizeof(v))
- return 0;
+ return 1;
printf("%d, want %d\n", v, val);
- return v == val;
+ return v != val;
}
int main(int argc, char **argv)
{
- int p_in[2], p_out[2], p_err[2], pid, i, pass = 1;
+ int p_in[2], p_out[2], p_err[2], pid, i, err = 0;
/*
* Prepare IO-s and fork the victim binary
@@ -142,9 +142,11 @@ int main(int argc, char **argv)
return 1;
printf("Checking the victim alive\n");
- pass = chk(p_out[0], 1);
- pass = chk(p_out[0], 42);
- if (!pass)
+ err = chk(p_out[0], 1);
+ if (err)
+ return 1;
+ err = chk(p_out[0], 42);
+ if (err)
return 1;
/*
@@ -176,14 +178,14 @@ int main(int argc, char **argv)
printf("Checking the result\n");
/* These two came from parasite */
- pass = chk(p_out[0], 138);
- pass = chk(p_out[0], 403);
+ err = chk(p_out[0], 138);
+ err |= chk(p_out[0], 403);
/* These two came from post-infect */
- pass = chk(p_out[0], 1234);
- pass = chk(p_out[0], 4096);
+ err |= chk(p_out[0], 1234);
+ err |= chk(p_out[0], 4096);
- if (pass)
+ if (!err)
printf("All OK\n");
else
printf("Something went WRONG\n");