Merge branch 'fix/andre/tests-shorter-includes' into 'master'

[tests] use shorter, path-independent includes

See merge request frama-c/frama-c!3147

tests/builtins/alloc.c

@@ -5,7 +5,7 @@
 */
 
 
-#include "share/libc/stdlib.c"
+#include "stdlib.c"
 
 int *p,*q,*r,a,b;
 char *t,*u,*v;

tests/builtins/malloc_individual.c

@@ -2,7 +2,7 @@
    STDOPT: #"-eva-alloc-builtin fresh"
 */
 
-#include "share/libc/stdlib.c"
+#include "stdlib.c"
 
 int *p;
 int A,B,C;

tests/libc/fc_libc.c

@@ -22,7 +22,7 @@
 #define _POSIX_C_SOURCE 200112L
 #define _GNU_SOURCE 1
 
-#include "share/libc/__fc_runtime.c"
+#include "__fc_runtime.c"
 
 #include "alloca.h"
 #include "arpa/inet.h"

tests/rte/divmod.c

@@ -2,7 +2,7 @@
    OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32 -journal-disable
 */
 
-#include "share/libc/limits.h"
+#include "limits.h"
 
 
 int main() {

tests/rte/divmod_typedef.c

@@ -2,7 +2,7 @@
    OPT: -rte -warn-signed-overflow -warn-signed-downcast -print -machdep x86_32 -journal-disable
 */
 
-#include "share/libc/limits.h"
+#include "limits.h"
 
 typedef int tint;
 typedef unsigned int tuint;

tests/saveload/bool.c

@@ -5,7 +5,7 @@
  */
 
 #include "stdbool.h"
-#include "share/libc/stdio.h"
+#include "stdio.h"
 
 bool x;
 int y;

tests/slicing/adpcm.c

@@ -4,4 +4,4 @@
    OPT: @EVA_OPTIONS@ -machdep x86_32 -ulevel -1 -deps -slicing-level 2 -journal-disable
 */
 
-#include "tests/test/adpcm.c"
+#include "../test/adpcm.c"

tests/slicing/min_call.c

@@ -7,4 +7,4 @@
 /* dummy source file in order to test minimal calls feature
  * on select_return.i  */
 
-#include "tests/slicing/select_return.i"
+#include "select_return.i"

tests/slicing/select_simple.c

@@ -6,4 +6,4 @@
 
 /* dummy source file in order to test select_simple.ml */
 
-#include "tests/slicing/simple_intra_slice.i"
+#include "simple_intra_slice.i"

tests/spec/acsl_basic_allocator.c

@@ -8,7 +8,7 @@
 /* This file presents the basic version of the allocator.                    */
 /*****************************************************************************/
 
-#include "share/libc/stdlib.h"
+#include "stdlib.h"
 
 #define DEFAULT_BLOCK_SIZE 1000
 

tests/spec/axiom_included.c

@@ -2,4 +2,4 @@
    STDOPT: +"tests/spec/axiom_included_1.c"
 */
 
-#include "tests/spec/axiom_included.h"
+#include "axiom_included.h"

tests/spec/axiom_included_1.c

@@ -2,4 +2,4 @@
    DONTRUN: main test is in axiom_included.c
 */
 
-#include "tests/spec/axiom_included.h"
+#include "axiom_included.h"

tests/spec/merge_bts938.c

@@ -2,7 +2,7 @@
    STDOPT: +"tests/spec/merge_bts938_1.c"
 */
 
-#include "tests/spec/merge_bts938.h"
+#include "merge_bts938.h"
 
 //@ ensures test:\true;
 int main(void) { }

tests/spec/merge_bts938_1.c

@@ -2,7 +2,7 @@
    DONTRUN: main test is merge_bts938.c
 */
 
-#include "tests/spec/merge_bts938.h"
+#include "merge_bts938.h"
 
 //@ ensures test1: \true;
 int main(void);

tests/spec/model1.c

@@ -2,7 +2,7 @@
 STDOPT: +"tests/spec/model2.c"
 */
 
-#include "tests/spec/model1.h"
+#include "model1.h"
 
 void main () {
   struct S s;

tests/spec/model2.c

@@ -2,7 +2,7 @@
 DONTRUN: main test is in tests/spec/model1.c
 */
 
-#include "tests/spec/model1.h"
+#include "model1.h"
 
 struct S { int bar; };
 

tests/spec/purse.c

@@ -21,7 +21,7 @@
 /*  (enclosed in the file GPL).                                           */
 /*                                                                        */
 /**************************************************************************/
-#include "share/libc/stdlib.h"
+#include "stdlib.h"
 typedef struct purse {
   int balance;
 } purse;

tests/spec/use.c

@@ -4,7 +4,7 @@
 
 // BTS 0887
 
-#include "tests/spec/dec.h"
+#include "dec.h"
 
 //@ ensures X > 0 ; ensures F(1) > 0 ;
 void f(void) {}

tests/spec/use2.c

@@ -2,7 +2,7 @@
    DONTRUN: main test is in use.c
 */
 
-#include "tests/spec/dec.h"
+#include "dec.h"
 
 //@ ensures X > 0 ; ensures F(1)>0 ;
 void g(void) {}

tests/spec/volatile.c

@@ -2,7 +2,7 @@
    OPT: tests/spec/volatile_aux.c -print -copy
 */
 
-#include "tests/spec/volatile.h"
+#include "volatile.h"
 
 //@volatile x,y writes w ;
 //@volatile y,z reads r writes w; // partially KO: y already has a writes