From 97a2d825d7d65d5b34617544df5d7fbd9d22cf24 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Mon, 19 Oct 2020 14:48:40 +0200
Subject: [PATCH] [mdr] use deterministic output in test
---
.../markdown-report/tests/sarif/cwe125.c | 2 +-
.../tests/sarif/oracle/cwe125.sarif | 35 ++++++++++++-------
2 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/plugins/markdown-report/tests/sarif/cwe125.c b/src/plugins/markdown-report/tests/sarif/cwe125.c
index bfab3933617..67fe3abe8db 100644
--- a/src/plugins/markdown-report/tests/sarif/cwe125.c
+++ b/src/plugins/markdown-report/tests/sarif/cwe125.c
@@ -2,7 +2,7 @@
NOFRAMAC: use execnow for proper sequencing of executions
EXECNOW: @frama-c@ @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@_parse.sav
EXECNOW: @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@_parse.sav -eva -save @PTEST_DIR@/result/@PTEST_NAME@_eva.sav
-EXECNOW: LOG @PTEST_NAME@.sarif @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@_eva.sav -mdr-out @PTEST_DIR@/result/@PTEST_NAME@.sarif -mdr-gen sarif -mdr-no-print-libc
+EXECNOW: LOG @PTEST_NAME@.sarif @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@_eva.sav -then -mdr-out @PTEST_DIR@/result/@PTEST_NAME@.sarif -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic
*/
#include "__fc_builtin.h"
diff --git a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif
index 7d764f742fa..3c9e4220598 100644
--- a/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif
+++ b/src/plugins/markdown-report/tests/sarif/oracle/cwe125.sarif
@@ -7,9 +7,8 @@
"tool": {
"driver": {
"name": "frama-c",
- "fullName": "frama-c-21.1+dev (Scandium)",
- "version": "21.1+dev (Scandium)",
- "semanticVersion": "21.1+dev",
+ "fullName": "frama-c-0+omitted-for-deterministic-output",
+ "version": "0+omitted-for-deterministic-output",
"downloadUri": "https://frama-c.com/download.html",
"informationUri": "https://frama-c.com"
}
@@ -37,26 +36,36 @@
},
{
"commandLine":
- "frama-c -check -load tests/sarif/result/cwe125_eva.sav -mdr-out tests/sarif/result/cwe125.sarif -mdr-gen sarif -mdr-no-print-libc",
+ "frama-c -check -load tests/sarif/result/cwe125_eva.sav -then -mdr-out tests/sarif/result/cwe125.sarif -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic",
"arguments": [
- "-check", "-load", "tests/sarif/result/cwe125_eva.sav",
+ "-check", "-load", "tests/sarif/result/cwe125_eva.sav", "-then",
"-mdr-out", "tests/sarif/result/cwe125.sarif", "-mdr-gen",
- "sarif", "-mdr-no-print-libc"
+ "sarif", "-mdr-no-print-libc", "-mdr-sarif-deterministic"
+ ],
+ "exitCode": 0,
+ "executionSuccessful": true
+ },
+ {
+ "commandLine":
+ "frama-c -check -load tests/sarif/result/cwe125_eva.sav -then -mdr-out tests/sarif/result/cwe125.sarif -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic",
+ "arguments": [
+ "-check", "-load", "tests/sarif/result/cwe125_eva.sav", "-then",
+ "-mdr-out", "tests/sarif/result/cwe125.sarif", "-mdr-gen",
+ "sarif", "-mdr-no-print-libc", "-mdr-sarif-deterministic"
],
"exitCode": 0,
"executionSuccessful": true
}
],
"originalUriBaseIds": {
- "FRAMAC_SHARE": { "uri": "file:///home/andr/git/frama-c-2/share/" },
- "FRAMAC_LIB": { "uri": "file:///home/andr/git/frama-c-2/lib/fc/" },
+ "FRAMAC_SHARE": {
+ "uri": "file:///omitted-for-deterministic-output/"
+ },
+ "FRAMAC_LIB": { "uri": "file:///omitted-for-deterministic-output/" },
"FRAMAC_PLUGIN": {
- "uri": "file:///home/andr/git/frama-c-2/lib/plugins/"
+ "uri": "file:///omitted-for-deterministic-output/"
},
- "PWD": {
- "uri":
- "file:///home/andr/git/frama-c-2/src/plugins/markdown-report/"
- }
+ "PWD": { "uri": "file:///omitted-for-deterministic-output/" }
},
"artifacts": [
{
--
GitLab