From ba354dd5876b7c7579de0bb85e4a9ac5868f0ded Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Thu, 26 Nov 2020 18:15:33 +0100
Subject: [PATCH] [tests] stabilize oracle related to make-wrapper
---
tests/fc_script/make-wrapper.c | 3 ++-
tests/fc_script/oracle/make-wrapper.res | 4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/fc_script/make-wrapper.c b/tests/fc_script/make-wrapper.c
index 4375eef42f7..f8dd1a008e2 100644
--- a/tests/fc_script/make-wrapper.c
+++ b/tests/fc_script/make-wrapper.c
@@ -1,6 +1,7 @@
/* run.config
NOFRAMAC: testing frama-c-script
- EXECNOW: LOG make-wrapper.res LOG make-wrapper.err cd @PTEST_DIR@ && FRAMAC=../../bin/frama-c ../../bin/frama-c-script make-wrapper --make-dir . -f make-for-make-wrapper.mk | sed -e "s:$PWD:PWD:g" | grep -v "make:.*Error" > result/make-wrapper.res 2> result/make-wrapper.err && rm -rf make-for-make-wrapper.parse make-for-make-wrapper.eva
+ COMMENT: we must filter 'make:' output lines, since they differ when run by the CI (e.g. mention to jobserver)
+ EXECNOW: LOG make-wrapper.res LOG make-wrapper.err cd @PTEST_DIR@ && FRAMAC=../../bin/frama-c ../../bin/frama-c-script make-wrapper --make-dir . -f make-for-make-wrapper.mk | sed -e "s:$PWD:PWD:g" | grep -v "^make.*" > result/make-wrapper.res 2> result/make-wrapper.err && rm -rf make-for-make-wrapper.parse make-for-make-wrapper.eva
*/
int defined(int a);
diff --git a/tests/fc_script/oracle/make-wrapper.res b/tests/fc_script/oracle/make-wrapper.res
index d2d19765aa4..9faa818ae65 100644
--- a/tests/fc_script/oracle/make-wrapper.res
+++ b/tests/fc_script/oracle/make-wrapper.res
@@ -1,4 +1,3 @@
-make: Entering directory 'PWD'
�[34mCommand: ../../bin/frama-c -kernel-warn-key annot:missing-spec=abort -kernel-warn-key typing:implicit-function-declaration=abort -cpp-extra-args="" make-wrapper.c make-wrapper2.c�[m
@@ -11,12 +10,11 @@ make: Entering directory 'PWD'
[eva] Computing initial state
[eva] Initial state computed
[eva] using specification for function specified
-[kernel:annot:missing-spec] make-wrapper.c:16: Warning:
+[kernel:annot:missing-spec] make-wrapper.c:17: Warning:
Neither code nor specification for function external, generating default assigns from the prototype
[kernel] User Error: warning annot:missing-spec treated as fatal error.
[kernel] Frama-C aborted: invalid user input.
[kernel] Warning: attempting to save on non-zero exit code: modifying filename into `PWD/make-for-make-wrapper.eva/framac.sav.error'.
-make: Leaving directory 'PWD'
***** make-wrapper recommendations *****
--
GitLab