From c487c8812ec2123a56d5e359c1c0bdbc4b5a7b60 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Tue, 7 Dec 2021 19:10:50 +0100
Subject: [PATCH] [instantiate tests] renames generated result files

---
 src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle   | 2 +-
 src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle     | 2 +-
 src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle   | 2 +-
 .../instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle     | 2 +-
 src/plugins/instantiate/tests/stdlib/test_config                | 2 +-
 src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle   | 2 +-
 src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle   | 2 +-
 src/plugins/instantiate/tests/string/oracle/memmove.res.oracle  | 2 +-
 src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle | 2 +-
 .../instantiate/tests/string/oracle/memset_FF.res.oracle        | 2 +-
 .../tests/string/oracle/memset_nested_typedef.res.oracle        | 2 +-
 .../tests/string/oracle/memset_nested_union.res.oracle          | 2 +-
 .../instantiate/tests/string/oracle/memset_value.res.oracle     | 2 +-
 src/plugins/instantiate/tests/string/test_config                | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
index e2656fb9461..05d54eb1b36 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
@@ -316,7 +316,7 @@ int main(void)
 }
 
 
-[kernel] Parsing tests/stdlib/result/calloc.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_calloc.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stdlib.h"
 struct X {
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle
index a0671fe0bc8..51554abd5d6 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/free.res.oracle
@@ -139,7 +139,7 @@ void with_incomplete(struct incomplete *t)
 }
 
 
-[kernel] Parsing tests/stdlib/result/free.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_free.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stdlib.h"
 struct incomplete;
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
index 5fc593cb30d..e887b486810 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
@@ -218,7 +218,7 @@ int main(void)
 }
 
 
-[kernel] Parsing tests/stdlib/result/malloc.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_malloc.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stdlib.h"
 struct X {
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
index fd611034c64..6875e220214 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
@@ -124,7 +124,7 @@ void foo(void)
 }
 
 
-[kernel] Parsing tests/stdlib/result/no_fc_stdlib.c (with preprocessing)
+[kernel] Parsing tests/stdlib/result/ocode_no_fc_stdlib.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 /*@ ghost extern int __fc_heap_status; */
diff --git a/src/plugins/instantiate/tests/stdlib/test_config b/src/plugins/instantiate/tests/stdlib/test_config
index 265a1378a0c..04017483a6c 100644
--- a/src/plugins/instantiate/tests/stdlib/test_config
+++ b/src/plugins/instantiate/tests/stdlib/test_config
@@ -1 +1 @@
-OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/@PTEST_NAME@.c -ocode="" -print
+OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/ocode_@PTEST_NAME@.c -ocode="" -print
diff --git a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
index 7923384e2ab..b6b11b24645 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
@@ -181,7 +181,7 @@ void with_null_or_int(int p[10])
 }
 
 
-[kernel] Parsing tests/string/result/memcmp.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memcmp.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
index 994ecf23048..82350dffc1f 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
@@ -195,7 +195,7 @@ void with_null_or_int(int p[10])
 }
 
 
-[kernel] Parsing tests/string/result/memcpy.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memcpy.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
index 660db18e3fa..d88dce37409 100644
--- a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
@@ -182,7 +182,7 @@ void with_null_or_int(int p[10])
 }
 
 
-[kernel] Parsing tests/string/result/memmove.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memmove.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
index e38819902b0..47f2d1af5dd 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
@@ -278,7 +278,7 @@ void with_null_or_int(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_0.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_0.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
index ba73c933112..f9e34dfba07 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
@@ -416,7 +416,7 @@ void with_null_or_int(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_FF.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_FF.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle
index c99bbab555a..c75e4edc389 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_nested_typedef.res.oracle
@@ -34,7 +34,7 @@ void test(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_nested_typedef.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_nested_typedef.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle
index 7185fe7a665..f552f8742b4 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_nested_union.res.oracle
@@ -20,7 +20,7 @@ void test(void)
 }
 
 
-[kernel] Parsing tests/string/result/memset_nested_union.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_nested_union.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
index 545f2fa144a..4f82f4a1d43 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
@@ -192,7 +192,7 @@ void with_null_or_int(int value)
 }
 
 
-[kernel] Parsing tests/string/result/memset_value.c (with preprocessing)
+[kernel] Parsing tests/string/result/ocode_memset_value.c (with preprocessing)
 /* Generated by Frama-C */
 #include "stddef.h"
 #include "string.h"
diff --git a/src/plugins/instantiate/tests/string/test_config b/src/plugins/instantiate/tests/string/test_config
index 1fb66d3b40f..04017483a6c 100644
--- a/src/plugins/instantiate/tests/string/test_config
+++ b/src/plugins/instantiate/tests/string/test_config
@@ -1 +1 @@
-OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/@PTEST_NAME@.c -ocode="" -print
\ No newline at end of file
+OPT: @PTEST_FILE@ -instantiate -print -check -then -ocode @PTEST_RESULT@/ocode_@PTEST_NAME@.c -print -then -no-instantiate @PTEST_RESULT@/ocode_@PTEST_NAME@.c -ocode="" -print
-- 
GitLab