From 00f96d80fc3c0be0cd9a575140cb8098ab621f82 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Fri, 5 Jun 2015 10:46:30 +0200
Subject: [PATCH] [tests] stability wrt OCaml 3.12.1
---
src/plugins/e-acsl/literal_strings.ml | 2 +-
.../e-acsl/tests/bts/oracle/gen_bts1390.c | 10 +++++-----
.../e-acsl/tests/bts/oracle/gen_bts13902.c | 10 +++++-----
.../e-acsl/tests/bts/oracle/gen_bts1837.c | 20 +++++++++----------
.../oracle/gen_literal_string.c | 20 +++++++++----------
.../oracle/gen_literal_string2.c | 20 +++++++++----------
6 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/plugins/e-acsl/literal_strings.ml b/src/plugins/e-acsl/literal_strings.ml
index ba294e4d1d0..cb8ab4f4999 100644
--- a/src/plugins/e-acsl/literal_strings.ml
+++ b/src/plugins/e-acsl/literal_strings.ml
@@ -32,7 +32,7 @@ let is_empty () = Datatype.String.Hashtbl.length strings = 0
let add = Datatype.String.Hashtbl.add strings
let find = Datatype.String.Hashtbl.find strings
-let fold f = Datatype.String.Hashtbl.fold f strings
+let fold f = Datatype.String.Hashtbl.fold_sorted f strings
(*
Local Variables:
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
index 50aadc2155f..95439a4657d 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
@@ -1,6 +1,6 @@
/* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_2;
struct __anonstruct___mpz_struct_1 {
int _mp_alloc ;
int _mp_size ;
@@ -241,14 +241,14 @@ void *__e_acsl_memchr(void const *buf, int c, size_t n)
void __e_acsl_memory_init(void)
{
- __e_acsl_literal_string_2 = "tata";
- __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
- __full_init((void *)__e_acsl_literal_string_2);
- __literal_string((void *)__e_acsl_literal_string_2);
__e_acsl_literal_string = "toto";
__store_block((void *)__e_acsl_literal_string,sizeof("toto"));
__full_init((void *)__e_acsl_literal_string);
__literal_string((void *)__e_acsl_literal_string);
+ __e_acsl_literal_string_2 = "tata";
+ __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
+ __full_init((void *)__e_acsl_literal_string_2);
+ __literal_string((void *)__e_acsl_literal_string_2);
return;
}
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts13902.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts13902.c
index c3965f7f49c..4405fd55d8d 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts13902.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts13902.c
@@ -1,6 +1,6 @@
/* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_2;
struct __anonstruct___mpz_struct_1 {
int _mp_alloc ;
int _mp_size ;
@@ -386,14 +386,14 @@ void *__e_acsl_memchr(void const *buf, int c, size_t n)
void __e_acsl_memory_init(void)
{
- __e_acsl_literal_string_2 = "tata";
- __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
- __full_init((void *)__e_acsl_literal_string_2);
- __literal_string((void *)__e_acsl_literal_string_2);
__e_acsl_literal_string = "toto";
__store_block((void *)__e_acsl_literal_string,sizeof("toto"));
__full_init((void *)__e_acsl_literal_string);
__literal_string((void *)__e_acsl_literal_string);
+ __e_acsl_literal_string_2 = "tata";
+ __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
+ __full_init((void *)__e_acsl_literal_string_2);
+ __literal_string((void *)__e_acsl_literal_string_2);
return;
}
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
index 6a0ea2b012a..686c78bb30d 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
@@ -1,7 +1,7 @@
/* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
-char *__e_acsl_literal_string;
char *__e_acsl_literal_string_3;
+char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_2;
struct __anonstruct___mpz_struct_1 {
int _mp_alloc ;
int _mp_size ;
@@ -141,18 +141,18 @@ int f(void)
void __e_acsl_memory_init(void)
{
- __e_acsl_literal_string_2 = "bar";
- __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
- __full_init((void *)__e_acsl_literal_string_2);
- __literal_string((void *)__e_acsl_literal_string_2);
- __e_acsl_literal_string = "foo";
- __store_block((void *)__e_acsl_literal_string,sizeof("foo"));
- __full_init((void *)__e_acsl_literal_string);
- __literal_string((void *)__e_acsl_literal_string);
__e_acsl_literal_string_3 = "toto";
__store_block((void *)__e_acsl_literal_string_3,sizeof("toto"));
__full_init((void *)__e_acsl_literal_string_3);
__literal_string((void *)__e_acsl_literal_string_3);
+ __e_acsl_literal_string = "foo";
+ __store_block((void *)__e_acsl_literal_string,sizeof("foo"));
+ __full_init((void *)__e_acsl_literal_string);
+ __literal_string((void *)__e_acsl_literal_string);
+ __e_acsl_literal_string_2 = "bar";
+ __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
+ __full_init((void *)__e_acsl_literal_string_2);
+ __literal_string((void *)__e_acsl_literal_string_2);
__store_block((void *)(& S),4U);
__full_init((void *)(& S));
S = (char *)__e_acsl_literal_string;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
index a21ae762bc8..5cbdd9a0e2b 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c
@@ -1,8 +1,8 @@
/* Generated by Frama-C */
-char *__e_acsl_literal_string_4;
-char *__e_acsl_literal_string_2;
char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_4;
char *__e_acsl_literal_string_3;
+char *__e_acsl_literal_string_2;
struct __anonstruct___mpz_struct_1 {
int _mp_alloc ;
int _mp_size ;
@@ -113,22 +113,22 @@ int G2 = 2;
char *U = (char *)"baz";
void __e_acsl_memory_init(void)
{
- __e_acsl_literal_string_4 = "foo2";
- __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
- __full_init((void *)__e_acsl_literal_string_4);
- __literal_string((void *)__e_acsl_literal_string_4);
- __e_acsl_literal_string_2 = "bar";
- __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
- __full_init((void *)__e_acsl_literal_string_2);
- __literal_string((void *)__e_acsl_literal_string_2);
__e_acsl_literal_string = "ss";
__store_block((void *)__e_acsl_literal_string,sizeof("ss"));
__full_init((void *)__e_acsl_literal_string);
__literal_string((void *)__e_acsl_literal_string);
+ __e_acsl_literal_string_4 = "foo2";
+ __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
+ __full_init((void *)__e_acsl_literal_string_4);
+ __literal_string((void *)__e_acsl_literal_string_4);
__e_acsl_literal_string_3 = "foo";
__store_block((void *)__e_acsl_literal_string_3,sizeof("foo"));
__full_init((void *)__e_acsl_literal_string_3);
__literal_string((void *)__e_acsl_literal_string_3);
+ __e_acsl_literal_string_2 = "bar";
+ __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
+ __full_init((void *)__e_acsl_literal_string_2);
+ __literal_string((void *)__e_acsl_literal_string_2);
__store_block((void *)(& S2),4U);
__full_init((void *)(& S2));
S2 = (char *)__e_acsl_literal_string_4;
diff --git a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c
index c64b325f8fa..d5bb4999c2d 100644
--- a/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c
+++ b/src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c
@@ -1,8 +1,8 @@
/* Generated by Frama-C */
-char *__e_acsl_literal_string_4;
-char *__e_acsl_literal_string_2;
char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_4;
char *__e_acsl_literal_string_3;
+char *__e_acsl_literal_string_2;
struct __anonstruct___mpz_struct_1 {
int _mp_alloc ;
int _mp_size ;
@@ -141,22 +141,22 @@ int G2 = 2;
char *U = (char *)"baz";
void __e_acsl_memory_init(void)
{
- __e_acsl_literal_string_4 = "foo2";
- __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
- __full_init((void *)__e_acsl_literal_string_4);
- __literal_string((void *)__e_acsl_literal_string_4);
- __e_acsl_literal_string_2 = "bar";
- __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
- __full_init((void *)__e_acsl_literal_string_2);
- __literal_string((void *)__e_acsl_literal_string_2);
__e_acsl_literal_string = "ss";
__store_block((void *)__e_acsl_literal_string,sizeof("ss"));
__full_init((void *)__e_acsl_literal_string);
__literal_string((void *)__e_acsl_literal_string);
+ __e_acsl_literal_string_4 = "foo2";
+ __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
+ __full_init((void *)__e_acsl_literal_string_4);
+ __literal_string((void *)__e_acsl_literal_string_4);
__e_acsl_literal_string_3 = "foo";
__store_block((void *)__e_acsl_literal_string_3,sizeof("foo"));
__full_init((void *)__e_acsl_literal_string_3);
__literal_string((void *)__e_acsl_literal_string_3);
+ __e_acsl_literal_string_2 = "bar";
+ __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
+ __full_init((void *)__e_acsl_literal_string_2);
+ __literal_string((void *)__e_acsl_literal_string_2);
__store_block((void *)(& S2),4U);
__full_init((void *)(& S2));
S2 = (char *)__e_acsl_literal_string_4;
--
GitLab