From b1a2bb67e769d673ba1cda64380121d19973d5b9 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Thu, 7 Oct 2021 16:48:25 +0200
Subject: [PATCH] [e-acsl:tests] do not break macros in tests to get
deterministic behaviors
---
src/plugins/e-acsl/tests/builtin/strcat.c | 4 ++--
src/plugins/e-acsl/tests/builtin/strlen.c | 12 ++++++------
src/plugins/e-acsl/tests/format/fprintf.c | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/plugins/e-acsl/tests/builtin/strcat.c b/src/plugins/e-acsl/tests/builtin/strcat.c
index 2c4888ccb58..711436b665c 100644
--- a/src/plugins/e-acsl/tests/builtin/strcat.c
+++ b/src/plugins/e-acsl/tests/builtin/strcat.c
@@ -65,8 +65,8 @@ int main(int argc, const char **argv) {
/* strcat */
OK(strcat(dest1, const_str)); // enough space in dest [ok]
- OK(strcat(dest3,
- empty_str)); // enough space in dest (concat with empty) [ok]
+ // enough space in dest (concat with empty) [ok]:
+ OK(strcat(dest3, empty_str));
ABRT(strcat(dest2, const_str)); // insufficient space in dest [abort]
ABRT(strcat(unalloc_str, const_str)); // unallocated in dest [abort]
ABRT(strcat(dest2, unalloc_str)); // unallocated in src [abort]
diff --git a/src/plugins/e-acsl/tests/builtin/strlen.c b/src/plugins/e-acsl/tests/builtin/strlen.c
index fa4b27884db..b7ef400329c 100644
--- a/src/plugins/e-acsl/tests/builtin/strlen.c
+++ b/src/plugins/e-acsl/tests/builtin/strlen.c
@@ -17,18 +17,18 @@ int main(int argc, const char **argv) {
char stack_str[] = "the dog";
char *const_str = "the hog";
- OK(EQ(len = strlen(empty_str),
- 0)); // strlen on a valid (zero-length) string [ok]
+ // strlen on a valid (zero-length) string [ok]:
+ OK(EQ(len = strlen(empty_str), 0));
OK(EQ(len = strlen(heap_str), 7)); // strlen on a heap string [ok]
OK(EQ(len = strlen(stack_str), 7)); // strlen on a stack string [ok]
OK(EQ(len = strlen(const_str), 7)); // strlen on a const string [ok]
heap_str[7] = 'a';
stack_str[7] = 'a';
- ABRT(EQ(len = strlen(heap_str),
- 7)); // strlen on unterminated heap string [abort]
- ABRT(EQ(len = strlen(stack_str),
- 7)); // strlen on unterminated stack string [abort]
+ // strlen on unterminated heap string [abort]:
+ ABRT(EQ(len = strlen(heap_str), 7));
+ // strlen on unterminated stack string [abort]:
+ ABRT(EQ(len = strlen(stack_str), 7));
free(heap_str);
ABRT(EQ(len = strlen(heap_str), 7)); // strlen on invalid heap string [abort]
return 0;
diff --git a/src/plugins/e-acsl/tests/format/fprintf.c b/src/plugins/e-acsl/tests/format/fprintf.c
index 87178190a11..41f91017210 100644
--- a/src/plugins/e-acsl/tests/format/fprintf.c
+++ b/src/plugins/e-acsl/tests/format/fprintf.c
@@ -44,7 +44,7 @@ int main(int argc, const char **argv) {
ABRT(snprintf(pstr, 6, "-%s-", "123")); // try read-only
ABRT(snprintf(buf, 6, "-%s-", "123")); // not enough space
ABRT(snprintf(NULL, 6, "-%s-", "123")); // not enough space
- OK(snprintf(NULL, 0, "-%s-",
- "123")); // NULL should be file because of 0 chars to write
+ // NULL should be fine because of 0 chars to write:
+ OK(snprintf(NULL, 0, "-%s-", "123"));
return 0;
}
--
GitLab