Merge branch 'test/jgirardsatabin/test-libs' into 'master'

Rework test target

See merge request laiser/caisar!147

Makefile

@@ -11,7 +11,7 @@ uninstall:
 	dune uninstall
 
 test:
-	dune build @tests/local
+	dune runtest
 
 test-ci:
 	dune build -j2 @tests/ci

caisar.opam

@@ -10,7 +10,7 @@ homepage: "https://git.frama-c.com/pub/caisar"
 doc: "https://git.frama-c.com/pub/caisar"
 bug-reports: "https://git.frama-c.com/pub/caisar/issues"
 depends: [
-  "dune" {>= "3.8"}
+  "dune" {>= "3.12"}
   "ocaml" {>= "4.13"}
   "dune-site" {>= "2.9.0"}
   "zarith" {>= "1.7"}

dune-project

-(lang dune 3.8)
+(lang dune 3.12)
 (name caisar)
 (version 2.0)
 

flake.nix

@@ -94,7 +94,10 @@
               dontBuild = true;
               dontInstall = true;
               doCheck = true;
-              checkPhase = "make test-ci";
+              checkPhase = ''
+                make test
+                make test-ci
+              '';
               buildInputs = oldAttrs.buildInputs ++
                 [ pkgs.python3Packages.onnx ];
             });

lib/onnx/tests/print.ml

@@ -20,7 +20,7 @@ let () =
 
 let () =
   let pid =
-    Unix.create_process "/usr/bin/python3"
+    Unix.create_process "python3"
       [| "python3"; "../../../tests/bin/inspect_onnx.py" |]
       Unix.stdin Unix.stdout Unix.stdout
   in

tests/comparison.t

@@ -2,6 +2,7 @@
 
   $ ls ../examples/
   acasxu
+  arithmetic
   mnist
   onnx_rewrite
 

tests/dune

 (cram
- (alias local)
- (applies_to * \ nir_to_onnx acasxu_ci arithmetic comparison sequencing)
+ (applies_to * \ nir_to_onnx acasxu_ci)
  (deps
   (package caisar)
   setup_env.sh
+  (glob_files bin/*)
+  filter_tmpdir.sh
   TestNetwork.nnet
   TestNetworkONNX.onnx
   TestSVM.ovo
-  (glob_files bin/*)
-  filter_tmpdir.sh
-  ../lib/xgboost/example/california.csv
-  ../lib/xgboost/example/california.json
-  )
- (package caisar))
-
- (cram
- (alias local)
- (applies_to arithmetic)
- (deps
-  (package caisar)
-  setup_env.sh
-  (glob_files bin/*)
-  filter_tmpdir.sh
   ../examples/arithmetic/arithmetic.why
   ../examples/arithmetic/FNN_s42.onnx
-  )
- (package caisar))
-
- (cram
- (alias local)
- (applies_to comparison)
- (deps
-  (package caisar)
-  setup_env.sh
-  (glob_files bin/*)
-  filter_tmpdir.sh
   ../examples/onnx_rewrite/comparison.mlw
+  ../examples/onnx_rewrite/sequencing.mlw
+  ../examples/acasxu/nets/onnx/ACASXU_1_1.onnx
+  ../examples/acasxu/nets/onnx/ACASXU_1_9.onnx
   ../examples/mnist/nets/pruned/FNN_28x28_s42.onnx
   ../examples/mnist/nets/pruned/FNN_28x28_pruned_s42.onnx
-  ../examples/mnist/csv/single_image.csv
-  )
- (package caisar))
-
- (cram
- (alias local)
- (applies_to sequencing)
- (deps
-  (package caisar)
-  setup_env.sh
-  (glob_files bin/*)
-  filter_tmpdir.sh
-  ../examples/onnx_rewrite/sequencing.mlw
   ../examples/mnist/nets/splitted/FNN_28x28_pre_s42.onnx
   ../examples/mnist/nets/splitted/FNN_28x28_post_s42.onnx
   ../examples/mnist/csv/single_image.csv
+  ../lib/xgboost/example/california.csv
+  ../lib/xgboost/example/california.json
   )
  (package caisar))
 
-
 (cram
  (alias ci)
+ (applies_to nir_to_onnx acasxu_ci)
  (enabled_if %{bin-available:python3})
+ (runtest_alias false)
  (deps
   (package caisar)
   setup_env.sh
+  (glob_files bin/*)
+  filter_tmpdir.sh
   TestNetwork.nnet
   TestNetworkONNX.onnx
+  TestSVM.ovo
   ../examples/acasxu/nets/onnx/ACASXU_1_1.onnx
   ../examples/acasxu/nets/onnx/ACASXU_1_9.onnx
-  TestSVM.ovo
-  (glob_files bin/*)
-  filter_tmpdir.sh
   ../lib/xgboost/example/california.csv
   ../lib/xgboost/example/california.json)
  (package caisar))

tests/sequencing.t

@@ -2,6 +2,7 @@
 
   $ ls ../examples/
   acasxu
+  arithmetic
   mnist
   onnx_rewrite