From e83ce9dcea07aa3d070bfe7268776987be00c95d Mon Sep 17 00:00:00 2001
From: David Monniaux <David.Monniaux@univ-grenoble-alpes.fr>
Date: Mon, 13 Sep 2021 15:57:52 +0200
Subject: bump ocaml version

---
 .gitlab-ci.yml                    | 22 +++++++++++-----------
 test/monniaux/csmith/Makefile     |  2 +-
 test/monniaux/csmith/Makefile.old | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 test/monniaux/csmith/Makefile.old

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 983d3a5f..d727fa6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
 
 check-admitted:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - eval `opam config env`
     - opam update
@@ -24,7 +24,7 @@ check-admitted:
     
 build_x86_64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - eval `opam config env`
     - opam update
@@ -48,7 +48,7 @@ build_x86_64:
 
 build_ia32:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-multilib
@@ -74,7 +74,7 @@ build_ia32:
 
 build_aarch64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-aarch64-linux-gnu qemu-user
@@ -100,7 +100,7 @@ build_aarch64:
 
 build_arm:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-arm-linux-gnueabi libc6-dev-armel-cross qemu-user
@@ -127,7 +127,7 @@ build_arm:
 
 build_armhf:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
@@ -153,7 +153,7 @@ build_armhf:
 
 build_ppc:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-powerpc-linux-gnu wget ninja-build libglib2.0-dev libpixman-1-dev
@@ -183,7 +183,7 @@ build_ppc:
 
 build_ppc64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-powerpc64-linux-gnu
@@ -208,7 +208,7 @@ build_ppc64:
 
 build_rv64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-riscv64-linux-gnu qemu-user
@@ -234,7 +234,7 @@ build_rv64:
 
 build_rv32:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-riscv64-linux-gnu qemu-user
@@ -257,7 +257,7 @@ build_rv32:
 
 build_kvx:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.1-flambda
+  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace
diff --git a/test/monniaux/csmith/Makefile b/test/monniaux/csmith/Makefile
index ab1c36b1..c98baadd 100644
--- a/test/monniaux/csmith/Makefile
+++ b/test/monniaux/csmith/Makefile
@@ -11,7 +11,7 @@ ifndef CSMITH
 CSMITH=csmith
 endif
 
-MAX=10
+MAX=300
 PREFIX=ran%06.f
 
 CCOMPOTS=-static
diff --git a/test/monniaux/csmith/Makefile.old b/test/monniaux/csmith/Makefile.old
new file mode 100644
index 00000000..56313452
--- /dev/null
+++ b/test/monniaux/csmith/Makefile.old
@@ -0,0 +1,23 @@
+CSMITH?=/local/monniaux/packages/csmith-2.3.0/bin/csmith
+MAX=1000
+
+include ../rules.mk
+KVX_CCOMPFLAGS+=-I/local/monniaux/packages/csmith-2.3.0/include/csmith-2.3.0 -fstruct-passing -fbitfields
+
+TARGETS_S=$(shell seq --format src%06.f.ccomp.kvx.s 0 $(MAX))
+TARGETS_C=$(shell seq --format src%06.f.c 0 $(MAX))
+TARGETS_O=$(shell seq --format src%06.f.ccomp.kvx.o 0 $(MAX))
+
+all: c s o
+
+s: $(TARGETS_S)
+c: $(TARGETS_C)
+o: $(TARGETS_O)
+
+src%.c :
+	$(CSMITH) --output $@ --seed $*
+
+clean:
+	-rm -f $(TARGETS_C) $(TARGETS_S) $(TARGETS_O)
+
+.PHONY: s c o clean
-- 
cgit