From ab9b27830497f8b02ddb2c1f74782ea4e26fd637 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 5 Apr 2018 12:12:59 +0800 Subject: [PATCH] Add actual test suite for configurator --- test/blackbox-tests/jbuild | 10 ++++++++++ .../test-cases/configurator/config/jbuild | 5 +++++ .../test-cases/configurator/config/run.ml | 6 ++++++ test/blackbox-tests/test-cases/configurator/run.t | 2 ++ 4 files changed, 23 insertions(+) create mode 100644 test/blackbox-tests/test-cases/configurator/config/jbuild create mode 100644 test/blackbox-tests/test-cases/configurator/config/run.ml create mode 100644 test/blackbox-tests/test-cases/configurator/run.t diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/jbuild index 01edbb92..becfd2ea 100644 --- a/test/blackbox-tests/jbuild +++ b/test/blackbox-tests/jbuild @@ -459,3 +459,13 @@ (progn (run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected)))))) + +(alias + ((name runtest) + (deps ((package jbuilder) + (files_recursively_in test-cases/configurator))) + (action + (chdir test-cases/configurator + (progn + (run ${exe:cram.exe} run.t) + (diff? run.t run.t.corrected)))))) diff --git a/test/blackbox-tests/test-cases/configurator/config/jbuild b/test/blackbox-tests/test-cases/configurator/config/jbuild new file mode 100644 index 00000000..0f63b54a --- /dev/null +++ b/test/blackbox-tests/test-cases/configurator/config/jbuild @@ -0,0 +1,5 @@ +(jbuild_version 1) + +(executable + ((name run) + (libraries (jbuilder.configurator)))) diff --git a/test/blackbox-tests/test-cases/configurator/config/run.ml b/test/blackbox-tests/test-cases/configurator/config/run.ml new file mode 100644 index 00000000..e7e39784 --- /dev/null +++ b/test/blackbox-tests/test-cases/configurator/config/run.ml @@ -0,0 +1,6 @@ +let () = + Configurator.main ~name:"config" (fun t -> + match Configurator.ocaml_config_var t "version" with + | None -> failwith "version is absent" + | Some _ -> print_endline "version is present" + ) diff --git a/test/blackbox-tests/test-cases/configurator/run.t b/test/blackbox-tests/test-cases/configurator/run.t new file mode 100644 index 00000000..5a57e654 --- /dev/null +++ b/test/blackbox-tests/test-cases/configurator/run.t @@ -0,0 +1,2 @@ + $ jbuilder exec config/run.exe + version is present