From b2b1f0865a6be3970d5af0d5bf11c55d76c2aee1 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 27 Jul 2022 13:31:41 +0200
Subject: [PATCH] removing some @PTEST_RESULT@ & @PTEST_DIR@
---
src/plugins/dive/tests/test_config | 2 +-
src/plugins/markdown-report/tests/md/cwe126.c | 2 +-
src/plugins/markdown-report/tests/md/test_config | 2 +-
src/plugins/markdown-report/tests/sarif/cwe125.c | 6 +++---
src/plugins/markdown-report/tests/sarif/libc.c | 4 ++--
src/plugins/markdown-report/tests/sarif/std_string.c | 2 +-
src/plugins/nonterm/tests/nonterm/output_to_file.i | 2 +-
src/plugins/server/tests/batch/test_config | 2 +-
src/plugins/variadic/tests/known/print_libc.c | 2 +-
tests/fc_script/main.c | 6 +++---
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/plugins/dive/tests/test_config b/src/plugins/dive/tests/test_config
index 2d0ddaaf029..c7640848779 100644
--- a/src/plugins/dive/tests/test_config
+++ b/src/plugins/dive/tests/test_config
@@ -1,4 +1,4 @@
LOG: @PTEST_NAME@.dot
PLUGIN: from,inout,eva,variadic,scope,dive
-OPT: -eva-msg-key=-initial-state -eva-no-show-progress -dive-output-dot @PTEST_RESULT@/@PTEST_NAME@.dot
+OPT: -eva-msg-key=-initial-state -eva-no-show-progress -dive-output-dot ./@PTEST_NAME@.dot
FILTER: perl -0777 -pe 's/\[server[^[]*//g'
diff --git a/src/plugins/markdown-report/tests/md/cwe126.c b/src/plugins/markdown-report/tests/md/cwe126.c
index 0750b43d6cb..015a0395139 100644
--- a/src/plugins/markdown-report/tests/md/cwe126.c
+++ b/src/plugins/markdown-report/tests/md/cwe126.c
@@ -1,6 +1,6 @@
/* run.config
PLUGIN: @PTEST_PLUGIN@ markdown-report.eva-info
- OPT: -mdr-remarks %{dep:@PTEST_DIR@/@PTEST_NAME@.remarks.md}
+ OPT: -mdr-remarks %{dep:./@PTEST_NAME@.remarks.md}
*/
/* extracted from Juliet test suite v1.3 for C
diff --git a/src/plugins/markdown-report/tests/md/test_config b/src/plugins/markdown-report/tests/md/test_config
index 43f2d664e45..3d564e21d56 100644
--- a/src/plugins/markdown-report/tests/md/test_config
+++ b/src/plugins/markdown-report/tests/md/test_config
@@ -1,3 +1,3 @@
PLUGIN: inout,scope,eva markdown-report
LOG: @PTEST_NAME@.@PTEST_NUMBER@.md
-CMD: @frama-c@ -eva @PTEST_FILE@ -mdr-gen md -mdr-date="now" -mdr-out @PTEST_RESULT@/@PTEST_NAME@.@PTEST_NUMBER@.md
+CMD: @frama-c@ -eva @PTEST_FILE@ -mdr-gen md -mdr-date="now" -mdr-out ./@PTEST_NAME@.@PTEST_NUMBER@.md
diff --git a/src/plugins/markdown-report/tests/sarif/cwe125.c b/src/plugins/markdown-report/tests/sarif/cwe125.c
index b983da0cb79..c7914cbf5bc 100644
--- a/src/plugins/markdown-report/tests/sarif/cwe125.c
+++ b/src/plugins/markdown-report/tests/sarif/cwe125.c
@@ -1,8 +1,8 @@
/* run.config
NOFRAMAC: use execnow for proper sequencing of executions
-EXECNOW: BIN @PTEST_NAME@_parse.sav LOG @PTEST_NAME@.parse.log LOG @PTEST_NAME@.parse.err @frama-c@ @PTEST_FILE@ -save @PTEST_RESULT@/@PTEST_NAME@_parse.sav > @PTEST_RESULT@/@PTEST_NAME@.parse.log 2> @PTEST_RESULT@/@PTEST_NAME@.parse.err
-EXECNOW: BIN @PTEST_NAME@_eva.sav LOG @PTEST_NAME@.eva.log LOG @PTEST_NAME@.eva.err @frama-c@ -load %{dep:@PTEST_RESULT@/@PTEST_NAME@_parse.sav} -eva -save @PTEST_RESULT@/@PTEST_NAME@_eva.sav > @PTEST_RESULT@/@PTEST_NAME@.eva.log 2> @PTEST_RESULT@/@PTEST_NAME@.eva.err
-EXECNOW: BIN @PTEST_NAME@.sarif.unfiltered LOG @PTEST_NAME@.sarif.log LOG @PTEST_NAME@.sarif.err @frama-c@ -load %{dep:@PTEST_RESULT@/@PTEST_NAME@_eva.sav} -then -mdr-out @PTEST_RESULT@/@PTEST_NAME@.sarif.unfiltered -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic > @PTEST_RESULT@/@PTEST_NAME@.sarif.log 2> @PTEST_RESULT@/@PTEST_NAME@.sarif.err
+EXECNOW: BIN @PTEST_NAME@_parse.sav LOG @PTEST_NAME@.parse.log LOG @PTEST_NAME@.parse.err @frama-c@ @PTEST_FILE@ -save ./@PTEST_NAME@_parse.sav > ./@PTEST_NAME@.parse.log 2> ./@PTEST_NAME@.parse.err
+EXECNOW: BIN @PTEST_NAME@_eva.sav LOG @PTEST_NAME@.eva.log LOG @PTEST_NAME@.eva.err @frama-c@ -load %{dep:./@PTEST_NAME@_parse.sav} -eva -save ./@PTEST_NAME@_eva.sav > ./@PTEST_NAME@.eva.log 2> ./@PTEST_NAME@.eva.err
+EXECNOW: BIN @PTEST_NAME@.sarif.unfiltered LOG @PTEST_NAME@.sarif.log LOG @PTEST_NAME@.sarif.err @frama-c@ -load %{dep:./@PTEST_NAME@_eva.sav} -then -mdr-out ./@PTEST_NAME@.sarif.unfiltered -mdr-gen sarif -mdr-no-print-libc -mdr-sarif-deterministic > ./@PTEST_NAME@.sarif.log 2> ./@PTEST_NAME@.sarif.err
EXECNOW: LOG @PTEST_NAME@.sarif sed -e "s:@PTEST_SESSION@:PTEST_SESSION:" %{dep:@PTEST_NAME@.sarif.unfiltered} > @PTEST_NAME@.sarif 2> @NULL
*/
#include "__fc_builtin.h"
diff --git a/src/plugins/markdown-report/tests/sarif/libc.c b/src/plugins/markdown-report/tests/sarif/libc.c
index 97ac292b335..0c78840e88d 100644
--- a/src/plugins/markdown-report/tests/sarif/libc.c
+++ b/src/plugins/markdown-report/tests/sarif/libc.c
@@ -1,10 +1,10 @@
/* run.config
CMD: @frama-c@ -eva -eva-no-results -mdr-gen sarif -mdr-sarif-deterministic
BIN: with-libc.sarif.unfiltered
- OPT: -mdr-out @PTEST_RESULT@/with-libc.sarif.unfiltered
+ OPT: -mdr-out ./with-libc.sarif.unfiltered
EXECNOW: LOG with-libc.sarif sed -e "s:@PTEST_SESSION@:PTEST_SESSION:" %{dep:with-libc.sarif.unfiltered} > with-libc.sarif 2> @NULL
BIN: without-libc.sarif.unfiltered
- OPT: -mdr-no-print-libc -mdr-out @PTEST_RESULT@/without-libc.sarif.unfiltered
+ OPT: -mdr-no-print-libc -mdr-out ./without-libc.sarif.unfiltered
EXECNOW: LOG without-libc.sarif sed -e "s:@PTEST_SESSION@:PTEST_SESSION:" %{dep:without-libc.sarif.unfiltered} > without-libc.sarif 2> @NULL
*/
#include <string.h>
diff --git a/src/plugins/markdown-report/tests/sarif/std_string.c b/src/plugins/markdown-report/tests/sarif/std_string.c
index 723cc5eda08..992e36a58f0 100644
--- a/src/plugins/markdown-report/tests/sarif/std_string.c
+++ b/src/plugins/markdown-report/tests/sarif/std_string.c
@@ -1,6 +1,6 @@
/* run.config*
BIN: @PTEST_NAME@.sarif.unfiltered
-OPT: -eva -then -mdr-sarif-deterministic -mdr-gen sarif -mdr-out @PTEST_RESULT@/@PTEST_NAME@.sarif.unfiltered
+OPT: -eva -then -mdr-sarif-deterministic -mdr-gen sarif -mdr-out ./@PTEST_NAME@.sarif.unfiltered
EXECNOW: LOG @PTEST_NAME@.sarif sed -e "s:@PTEST_SESSION@:PTEST_SESSION:" %{dep:@PTEST_NAME@.sarif.unfiltered} > @PTEST_NAME@.sarif 2> @NULL
*/
#include "string.c"
diff --git a/src/plugins/nonterm/tests/nonterm/output_to_file.i b/src/plugins/nonterm/tests/nonterm/output_to_file.i
index 94d49796629..fdafda6bdc0 100644
--- a/src/plugins/nonterm/tests/nonterm/output_to_file.i
+++ b/src/plugins/nonterm/tests/nonterm/output_to_file.i
@@ -1,6 +1,6 @@
/* run.config
LOG: output_to_file.txt
- STDOPT: #"-nonterm-log :@PTEST_RESULT@/output_to_file.txt"
+ STDOPT: #"-nonterm-log :./output_to_file.txt"
*/
void loop() {
diff --git a/src/plugins/server/tests/batch/test_config b/src/plugins/server/tests/batch/test_config
index 074eee0172b..88dfbe96420 100644
--- a/src/plugins/server/tests/batch/test_config
+++ b/src/plugins/server/tests/batch/test_config
@@ -1,3 +1,3 @@
PLUGIN: server
LOG: @PTEST_NAME@.out.json
-OPT: -server-batch %{dep:@PTEST_DIR@/@PTEST_NAME@.json} -server-batch-output-dir @PTEST_RESULT@ -server-msg-key use-relative-filepath
+OPT: -server-batch %{dep:./@PTEST_NAME@.json} -server-batch-output-dir @PTEST_RESULT@ -server-msg-key use-relative-filepath
diff --git a/src/plugins/variadic/tests/known/print_libc.c b/src/plugins/variadic/tests/known/print_libc.c
index d837ececb50..c5671d81d47 100644
--- a/src/plugins/variadic/tests/known/print_libc.c
+++ b/src/plugins/variadic/tests/known/print_libc.c
@@ -1,7 +1,7 @@
/* run.config
PLUGIN: variadic
LOG: @PTEST_NAME@.pretty.c
- OPT: %{dep:@PTEST_DIR@/empty.c} -no-print-libc -print -ocode @PTEST_RESULT@/@PTEST_NAME@.pretty.c -then @PTEST_RESULT@/@PTEST_NAME@.pretty.c
+ OPT: %{dep:./empty.c} -no-print-libc -print -ocode ./@PTEST_NAME@.pretty.c -then ./@PTEST_NAME@.pretty.c
*/
#include <stdio.h>
diff --git a/tests/fc_script/main.c b/tests/fc_script/main.c
index 890a11c43aa..1428c373f69 100644
--- a/tests/fc_script/main.c
+++ b/tests/fc_script/main.c
@@ -4,9 +4,9 @@
DEPS: main2.c main3.c main.c
EXECNOW: LOG list_files.res LOG list_files.err PTESTS_TESTING=1 %{bin:frama-c-script} list-files %{dep:./list_files.json} > ./list_files.res 2> ./list_files.err
DEPS: for-find-fun2.c for-find-fun.c for-list-functions.c for-list-functions.h for-list-functions2.h main2.c main3.c main.c make-wrapper2.c make-wrapper3.c make-wrapper.c
- EXECNOW: LOG find_fun1.res LOG find_fun1.err PTESTS_TESTING=1 %{bin:frama-c-script} find-fun main2 @PTEST_DIR@ > ./find_fun1.res 2> ./find_fun1.err
- EXECNOW: LOG find_fun2.res LOG find_fun2.err PTESTS_TESTING=1 %{bin:frama-c-script} find-fun main3 @PTEST_DIR@ > ./find_fun2.res 2> ./find_fun2.err
- EXECNOW: LOG find_fun3.res LOG find_fun3.err PTESTS_TESTING=1 %{bin:frama-c-script} find-fun false_positive @PTEST_DIR@ > ./find_fun3.res 2> ./find_fun3.err
+ EXECNOW: LOG find_fun1.res LOG find_fun1.err PTESTS_TESTING=1 %{bin:frama-c-script} find-fun main2 ./ > ./find_fun1.res 2> ./find_fun1.err
+ EXECNOW: LOG find_fun2.res LOG find_fun2.err PTESTS_TESTING=1 %{bin:frama-c-script} find-fun main3 ./ > ./find_fun2.res 2> ./find_fun2.err
+ EXECNOW: LOG find_fun3.res LOG find_fun3.err PTESTS_TESTING=1 %{bin:frama-c-script} find-fun false_positive ./ > ./find_fun3.res 2> ./find_fun3.err
DEPS:
EXECNOW: LOG list_functions.res LOG list_functions.err PTESTS_TESTING=1 %{bin:frama-c-script} list-functions %{dep:./for-find-fun2.c} %{dep:./for-list-functions.c} > ./list_functions.res 2> ./list_functions.err
EXECNOW: LOG list_functions2.res LOG list_functions2.err LOG list_functions2.json PTESTS_TESTING=1 %{bin:frama-c-script} list-functions %{dep:./for-find-fun2.c} %{dep:./for-list-functions.c} -list-functions-declarations -list-functions-output ./list_functions2.json -list-functions-debug 1 > ./list_functions2.res 2> ./list_functions2.err
--
GitLab