From a0820cd9f405a24c83050e8193e98d9be03158da Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 23 Jul 2021 11:15:37 +0200
Subject: [PATCH] files generated by tests go in result/ subdir, no oracle
ending in .log
---
.../ya/oracle/{saveload.res.0.log => saveload.res.0.log.txt} | 0
.../ya/oracle/{saveload.res.1.log => saveload.res.1.log.txt} | 0
src/plugins/aorai/tests/ya/saveload.i | 4 ++--
tests/pdg/call.c | 2 +-
tests/pdg/doc_dot.c | 4 ++--
tests/pdg/dyn_dpds.ml | 4 ++--
tests/pdg/oracle/call.res.oracle | 4 ++--
tests/pdg/oracle/doc_dot.res.oracle | 2 +-
tests/pdg/oracle/dyn_dpds.res.oracle | 4 ++--
9 files changed, 12 insertions(+), 12 deletions(-)
rename src/plugins/aorai/tests/ya/oracle/{saveload.res.0.log => saveload.res.0.log.txt} (100%)
rename src/plugins/aorai/tests/ya/oracle/{saveload.res.1.log => saveload.res.1.log.txt} (100%)
diff --git a/src/plugins/aorai/tests/ya/oracle/saveload.res.0.log b/src/plugins/aorai/tests/ya/oracle/saveload.res.0.log.txt
similarity index 100%
rename from src/plugins/aorai/tests/ya/oracle/saveload.res.0.log
rename to src/plugins/aorai/tests/ya/oracle/saveload.res.0.log.txt
diff --git a/src/plugins/aorai/tests/ya/oracle/saveload.res.1.log b/src/plugins/aorai/tests/ya/oracle/saveload.res.1.log.txt
similarity index 100%
rename from src/plugins/aorai/tests/ya/oracle/saveload.res.1.log
rename to src/plugins/aorai/tests/ya/oracle/saveload.res.1.log.txt
diff --git a/src/plugins/aorai/tests/ya/saveload.i b/src/plugins/aorai/tests/ya/saveload.i
index 24fb0c24fec..2ac81c70606 100644
--- a/src/plugins/aorai/tests/ya/saveload.i
+++ b/src/plugins/aorai/tests/ya/saveload.i
@@ -1,7 +1,7 @@
/* run.config
NOFRAMAC:
-EXECNOW: LOG @PTEST_NAME@.res.0.log BIN @PTEST_NAME@.sav @frama-c@ -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.res.0.log
-EXECNOW: LOG @PTEST_NAME@.res.1.log @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@.sav -then-on aorai -eva > @PTEST_DIR@/result/@PTEST_NAME@.res.1.log
+EXECNOW: LOG @PTEST_NAME@.res.0.log.txt BIN @PTEST_NAME@.sav @frama-c@ -aorai-automata @PTEST_DIR@/@PTEST_NAME@.ya @PTEST_FILE@ -save @PTEST_DIR@/result/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@.res.0.log.txt
+EXECNOW: LOG @PTEST_NAME@.res.1.log.txt @frama-c@ -load @PTEST_DIR@/result/@PTEST_NAME@.sav -then-on aorai -eva > @PTEST_DIR@/result/@PTEST_NAME@.res.1.log.txt
*/
/* run.config_prove
DONTRUN:
diff --git a/tests/pdg/call.c b/tests/pdg/call.c
index 1a48d0b295e..b71d403e4ba 100644
--- a/tests/pdg/call.c
+++ b/tests/pdg/call.c
@@ -1,6 +1,6 @@
/* run.config
- STDOPT: +"-lib-entry -main g -pdg -pdg-dot tests/pdg/call "
+ STDOPT: +"-lib-entry -main g -pdg -pdg-dot tests/pdg/result/call "
*/
/* Ne pas modifier : exemple utilisé dans le rapport. */
diff --git a/tests/pdg/doc_dot.c b/tests/pdg/doc_dot.c
index 74710f1cb5f..862b8bf8118 100644
--- a/tests/pdg/doc_dot.c
+++ b/tests/pdg/doc_dot.c
@@ -1,8 +1,8 @@
/* run.config
- STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot tests/pdg/doc"
+ STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot tests/pdg/result/doc"
*/
/* To build the svg file:
- * dot -Tsvg tests/pdg/doc.g.dot > tests/pdg/doc.g.svg
+ * dot -Tsvg tests/pdg/result/doc.g.dot > tests/pdg/result/doc.g.svg
*/
int G1, G2, T[10];
diff --git a/tests/pdg/dyn_dpds.ml b/tests/pdg/dyn_dpds.ml
index 834d304c304..caa5d09a5d8 100644
--- a/tests/pdg/dyn_dpds.ml
+++ b/tests/pdg/dyn_dpds.ml
@@ -23,7 +23,7 @@ let main _ =
let kf = Globals.Functions.find_def_by_name "main" in
let pdg = !Db.Pdg.get kf in
Format.printf "%a@." (!Db.Pdg.pretty ~bw:false) pdg;
- !Db.Pdg.extract pdg "tests/pdg/dyn_dpds_0.dot";
+ !Db.Pdg.extract pdg "tests/pdg/result/dyn_dpds_0.dot";
let assert_sid = 5 in (* assert ( *p>G) *)
let assert_stmt, kf = Kernel_function.find_from_sid assert_sid in
let _assert_node =
@@ -44,6 +44,6 @@ let main _ =
Format.printf "Warning : cannot select %a in this function...@\n"
Locations.Zone.pretty undef;
Format.printf "%a@." (!Db.Pdg.pretty ~bw:false) pdg;
- !Db.Pdg.extract pdg "tests/pdg/dyn_dpds_1.dot"
+ !Db.Pdg.extract pdg "tests/pdg/result/dyn_dpds_1.dot"
let () = Db.Main.extend main
diff --git a/tests/pdg/oracle/call.res.oracle b/tests/pdg/oracle/call.res.oracle
index 80cf9777950..f78649a62d3 100644
--- a/tests/pdg/oracle/call.res.oracle
+++ b/tests/pdg/oracle/call.res.oracle
@@ -22,12 +22,12 @@
[eva] done for function g
[pdg] computing for function f
[pdg] done for function f
-[pdg] dot file generated in tests/pdg/call.f.dot
+[pdg] dot file generated in tests/pdg/result/call.f.dot
[pdg] computing for function g
[from] Computing for function f
[from] Done for function f
[pdg] done for function g
-[pdg] dot file generated in tests/pdg/call.g.dot
+[pdg] dot file generated in tests/pdg/result/call.g.dot
[pdg] ====== PDG GRAPH COMPUTED ======
[pdg] PDG for f
{n1}: InCtrl
diff --git a/tests/pdg/oracle/doc_dot.res.oracle b/tests/pdg/oracle/doc_dot.res.oracle
index 84c3993bf51..4542afc3428 100644
--- a/tests/pdg/oracle/doc_dot.res.oracle
+++ b/tests/pdg/oracle/doc_dot.res.oracle
@@ -16,7 +16,7 @@
[from] Computing for function f
[from] Done for function f
[pdg] done for function g
-[pdg] dot file generated in tests/pdg/doc.g.dot
+[pdg] dot file generated in tests/pdg/result/doc.g.dot
[pdg] PDG for g
{n1}: InCtrl
{n2}: VarDecl : x
diff --git a/tests/pdg/oracle/dyn_dpds.res.oracle b/tests/pdg/oracle/dyn_dpds.res.oracle
index 232e2df8be3..658d717167d 100644
--- a/tests/pdg/oracle/dyn_dpds.res.oracle
+++ b/tests/pdg/oracle/dyn_dpds.res.oracle
@@ -94,7 +94,7 @@ RESULT for main:
-[--d]-> 13
{n16}: OutRet
-[--d]-> 15
-[pdg] dot file generated in tests/pdg/dyn_dpds_0.dot
+[pdg] dot file generated in tests/pdg/result/dyn_dpds_0.dot
Warning : cannot select G in this function...
RESULT for main:
{n1}: InCtrl
@@ -142,4 +142,4 @@ RESULT for main:
-[--d]-> 13
{n16}: OutRet
-[--d]-> 15
-[pdg] dot file generated in tests/pdg/dyn_dpds_1.dot
+[pdg] dot file generated in tests/pdg/result/dyn_dpds_1.dot
--
GitLab