From 4bc3f5c1e4d71e8a687b57d2039a52d8f8a8cc9f Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Thu, 3 Dec 2020 09:45:20 +0100
Subject: [PATCH] [tests] remove lines with colored output from test oracle
Use shell's 'test -t' to detect when running a test and strip color codes.
Co-authored-by: Valentin Perrelle <valentin.perrelle@cea.fr>
---
share/analysis-scripts/analysis.mk | 10 +++++++---
tests/fc_script/oracle/make-wrapper.res | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/share/analysis-scripts/analysis.mk b/share/analysis-scripts/analysis.mk
index 745b1cc1320..07bcf42f649 100644
--- a/share/analysis-scripts/analysis.mk
+++ b/share/analysis-scripts/analysis.mk
@@ -96,9 +96,13 @@ endif
# --- Utilities ---
define display_command =
- $(info )
- $(info $(shell tput setaf 4)Command: $(strip $(1))$(shell tput sgr0))
- $(info )
+ @{
+ echo '';
+ [ -t 1 ] && tput setaf 4;
+ echo "Command: $(strip $(1))";
+ [ -t 1 ] && tput sgr0;
+ echo '';
+ }
endef
empty :=
diff --git a/tests/fc_script/oracle/make-wrapper.res b/tests/fc_script/oracle/make-wrapper.res
index 2042715951f..18747999ef6 100644
--- a/tests/fc_script/oracle/make-wrapper.res
+++ b/tests/fc_script/oracle/make-wrapper.res
@@ -1,10 +1,10 @@
-[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(B[m
+Command: ../../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
[kernel] Parsing make-wrapper.c (with preprocessing)
[kernel] Parsing make-wrapper2.c (with preprocessing)
-[34mCommand: ../../bin/frama-c -kernel-warn-key annot:missing-spec=abort -kernel-warn-key typing:implicit-function-declaration=abort -eva -eva-no-print -eva-no-show-progress -eva-msg-key=-initial-state -eva-print-callstacks -eva-warn-key alarm=inactive -no-deps-print -no-calldeps-print -eva-warn-key garbled-mix -calldeps -from-verbose 0 -eva-warn-key builtins:missing-spec=abort(B[m
+Command: ../../bin/frama-c -kernel-warn-key annot:missing-spec=abort -kernel-warn-key typing:implicit-function-declaration=abort -eva -eva-no-print -eva-no-show-progress -eva-msg-key=-initial-state -eva-print-callstacks -eva-warn-key alarm=inactive -no-deps-print -no-calldeps-print -eva-warn-key garbled-mix -calldeps -from-verbose 0 -eva-warn-key builtins:missing-spec=abort
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
--
GitLab