From 1c4fd942500bb189234e4eec3b537dd0235f01a9 Mon Sep 17 00:00:00 2001 From: Allan Blanchard <allan.blanchard@cea.fr> Date: Thu, 24 Feb 2022 10:25:39 +0100 Subject: [PATCH] [wp] move dot files for region tests --- .../wp_region/oracle/{array1/region/job.dot => array1.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array1.res.oracle | 2 +- .../wp_region/oracle/{array2/region/job.dot => array2.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array2.res.oracle | 2 +- .../wp_region/oracle/{array3/region/job.dot => array3.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array3.res.oracle | 2 +- .../wp_region/oracle/{array4/region/job.dot => array4.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array4.res.oracle | 2 +- .../wp_region/oracle/{array5/region/job.dot => array5.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array5.res.oracle | 2 +- .../wp_region/oracle/{array6/region/job.dot => array6.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array6.res.oracle | 2 +- .../wp_region/oracle/{array7/region/job.dot => array7.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array7.res.oracle | 2 +- .../wp_region/oracle/{array8/region/job.dot => array8.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/array8.res.oracle | 2 +- .../wp_region/oracle/{fb_ADD/region/job.dot => fb_ADD.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle | 2 +- .../oracle/{fb_SORT/region/job.dot => fb_SORT.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle | 2 +- .../oracle/{garbled/region/job.dot => garbled.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle | 2 +- .../wp_region/oracle/{index/region/job.dot => index.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/index.res.oracle | 2 +- .../wp_region/oracle/{matrix/region/job.dot => matrix.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle | 2 +- .../{structarray1/region/job.dot => structarray1.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle | 2 +- .../{structarray2/region/job.dot => structarray2.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle | 2 +- .../{structarray3/region/job.dot => structarray3.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle | 2 +- .../{structarray4/region/job.dot => structarray4.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle | 2 +- .../wp_region/oracle/{swap/region/job.dot => swap.0.dot} | 0 src/plugins/wp/tests/wp_region/oracle/swap.res.oracle | 2 +- src/plugins/wp/tests/wp_region/test_config | 4 ++-- 37 files changed, 20 insertions(+), 20 deletions(-) rename src/plugins/wp/tests/wp_region/oracle/{array1/region/job.dot => array1.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array2/region/job.dot => array2.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array3/region/job.dot => array3.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array4/region/job.dot => array4.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array5/region/job.dot => array5.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array6/region/job.dot => array6.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array7/region/job.dot => array7.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{array8/region/job.dot => array8.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{fb_ADD/region/job.dot => fb_ADD.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{fb_SORT/region/job.dot => fb_SORT.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{garbled/region/job.dot => garbled.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{index/region/job.dot => index.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{matrix/region/job.dot => matrix.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{structarray1/region/job.dot => structarray1.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{structarray2/region/job.dot => structarray2.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{structarray3/region/job.dot => structarray3.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{structarray4/region/job.dot => structarray4.0.dot} (100%) rename src/plugins/wp/tests/wp_region/oracle/{swap/region/job.dot => swap.0.dot} (100%) diff --git a/src/plugins/wp/tests/wp_region/oracle/array1/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array1.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array1/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array1.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle index 81f1736f1ad..f594dcb8a6c 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array1.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array1.i (no preprocessing) -[wp] Region Graph: array1/region/job.dot +[wp] Region Graph: array1.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array2/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array2.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array2/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array2.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle index 68f76fba809..493acb0f321 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array2.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array2.i (no preprocessing) -[wp] Region Graph: array2/region/job.dot +[wp] Region Graph: array2.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array3/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array3.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array3/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array3.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle index f8d1b288590..ff1d6ff8c47 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array3.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array3.i (no preprocessing) -[wp] Region Graph: array3/region/job.dot +[wp] Region Graph: array3.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array4/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array4.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array4/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array4.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle index 566bc12ae36..a98da77e19c 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array4.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array4.i (no preprocessing) -[wp] Region Graph: array4/region/job.dot +[wp] Region Graph: array4.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array5/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array5.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array5/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array5.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle index 6e7cda1dedd..49fd11f80bd 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array5.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array5.i (no preprocessing) -[wp] Region Graph: array5/region/job.dot +[wp] Region Graph: array5.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array6/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array6.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array6/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array6.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle index a63a1285b24..814e494ce84 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array6.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array6.i (no preprocessing) -[wp] Region Graph: array6/region/job.dot +[wp] Region Graph: array6.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array7/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array7.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array7/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array7.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle index 27e44f159cf..8bd34f4ece8 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array7.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array7.i (no preprocessing) -[wp] Region Graph: array7/region/job.dot +[wp] Region Graph: array7.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/array8/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/array8.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/array8/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/array8.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle b/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle index f3518bbdce3..045b9aa7539 100644 --- a/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/array8.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing array8.i (no preprocessing) -[wp] Region Graph: array8/region/job.dot +[wp] Region Graph: array8.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/fb_ADD/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/fb_ADD.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/fb_ADD/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/fb_ADD.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle b/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle index ba8de5862e6..c174f1f4537 100644 --- a/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/fb_ADD.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing fb_ADD.i (no preprocessing) -[wp] Region Graph: fb_ADD/region/job.dot +[wp] Region Graph: fb_ADD.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/fb_SORT/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/fb_SORT.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/fb_SORT/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/fb_SORT.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle b/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle index efe7aeea124..bfcc8d4d3ca 100644 --- a/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/fb_SORT.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing fb_SORT.i (no preprocessing) -[wp] Region Graph: fb_SORT/region/job.dot +[wp] Region Graph: fb_SORT.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/garbled/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/garbled.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/garbled/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/garbled.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle b/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle index c71df0a7cab..c390ec3e2ad 100644 --- a/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/garbled.res.oracle @@ -2,6 +2,6 @@ [wp:garbled] Garbled Clusters: A=sint32 B=float32 [wp:garbled] Garbled Clusters: A=garbled B=sint32 [wp:garbled] Garbled Clusters: A=garbled B=float32 -[wp] Region Graph: garbled/region/job.dot +[wp] Region Graph: garbled.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/index/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/index.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/index/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/index.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/index.res.oracle b/src/plugins/wp/tests/wp_region/oracle/index.res.oracle index a0ba6fc1f32..953037c02fa 100644 --- a/src/plugins/wp/tests/wp_region/oracle/index.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/index.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing index.i (no preprocessing) -[wp] Region Graph: index/region/job.dot +[wp] Region Graph: index.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/matrix/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/matrix.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/matrix/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/matrix.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle b/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle index 9a80a89290a..01ca9097b9d 100644 --- a/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/matrix.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing matrix.i (no preprocessing) -[wp] Region Graph: matrix/region/job.dot +[wp] Region Graph: matrix.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray1/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/structarray1.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/structarray1/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/structarray1.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle index 61322c7a4d1..393a63b1498 100644 --- a/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/structarray1.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing structarray1.i (no preprocessing) -[wp] Region Graph: structarray1/region/job.dot +[wp] Region Graph: structarray1.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray2/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/structarray2.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/structarray2/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/structarray2.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle index 09e282b8fe8..f71c9e902cc 100644 --- a/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/structarray2.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing structarray2.i (no preprocessing) -[wp] Region Graph: structarray2/region/job.dot +[wp] Region Graph: structarray2.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray3/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/structarray3.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/structarray3/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/structarray3.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle index a8fd572b018..1e7d3cfb400 100644 --- a/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/structarray3.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing structarray3.i (no preprocessing) -[wp] Region Graph: structarray3/region/job.dot +[wp] Region Graph: structarray3.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray4/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/structarray4.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/structarray4/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/structarray4.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle b/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle index 3c11e623f76..0f68a735ae3 100644 --- a/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/structarray4.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing structarray4.i (no preprocessing) -[wp] Region Graph: structarray4/region/job.dot +[wp] Region Graph: structarray4.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/oracle/swap/region/job.dot b/src/plugins/wp/tests/wp_region/oracle/swap.0.dot similarity index 100% rename from src/plugins/wp/tests/wp_region/oracle/swap/region/job.dot rename to src/plugins/wp/tests/wp_region/oracle/swap.0.dot diff --git a/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle b/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle index da7dc84114f..77078dae158 100644 --- a/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle +++ b/src/plugins/wp/tests/wp_region/oracle/swap.res.oracle @@ -1,4 +1,4 @@ [kernel] Parsing swap.i (no preprocessing) -[wp] Region Graph: swap/region/job.dot +[wp] Region Graph: swap.0.dot [wp] Running WP plugin... [wp] Warning: Missing RTE guards diff --git a/src/plugins/wp/tests/wp_region/test_config b/src/plugins/wp/tests/wp_region/test_config index 95a1509ecb2..811354a6903 100644 --- a/src/plugins/wp/tests/wp_region/test_config +++ b/src/plugins/wp/tests/wp_region/test_config @@ -1,4 +1,4 @@ PLUGIN: wp,rtegen CMD: @frama-c@ -LOG: @PTEST_NAME@/region/job.dot -OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-warn-key pedantic-assigns=inactive -wp-out @PTEST_RESULT@/@PTEST_NAME@ -wp-fct job +LOG: @PTEST_NAME@.@PTEST_NUMBER@.dot +OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-warn-key pedantic-assigns=inactive -wp-region-output-dot @PTEST_RESULT@/@PTEST_NAME@.@PTEST_NUMBER@.dot -wp-fct job -- GitLab