From 2c29217a20b93d7993cbe4a9eb4bf47df232f145 Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Thu, 5 Jul 2018 16:32:26 +0200 Subject: [PATCH] Add a test case for project_root Signed-off-by: Etienne Millon --- test/blackbox-tests/dune.inc | 10 ++++++++++ test/blackbox-tests/test-cases/project-root/dune | 4 ++++ .../test-cases/project-root/dune-file/a/b/dune | 4 ++++ .../test-cases/project-root/dune-file/a/dune | 4 ++++ .../test-cases/project-root/dune-project | 1 + .../test-cases/project-root/jbuild-file/a/b/jbuild | 5 +++++ .../test-cases/project-root/jbuild-file/a/jbuild | 5 +++++ test/blackbox-tests/test-cases/project-root/run.t | 9 +++++++++ 8 files changed, 42 insertions(+) create mode 100644 test/blackbox-tests/test-cases/project-root/dune create mode 100644 test/blackbox-tests/test-cases/project-root/dune-file/a/b/dune create mode 100644 test/blackbox-tests/test-cases/project-root/dune-file/a/dune create mode 100644 test/blackbox-tests/test-cases/project-root/dune-project create mode 100644 test/blackbox-tests/test-cases/project-root/jbuild-file/a/b/jbuild create mode 100644 test/blackbox-tests/test-cases/project-root/jbuild-file/a/jbuild create mode 100644 test/blackbox-tests/test-cases/project-root/run.t diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc index 3a339765..e7769aea 100644 --- a/test/blackbox-tests/dune.inc +++ b/test/blackbox-tests/dune.inc @@ -507,6 +507,14 @@ test-cases/private-public-overlap (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) +(alias + (name project-root) + (deps (package dune) (source_tree test-cases/project-root)) + (action + (chdir + test-cases/project-root + (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) + (alias (name promote) (deps (package dune) (source_tree test-cases/promote)) @@ -673,6 +681,7 @@ (alias path-variables) (alias ppx-rewriter) (alias private-public-overlap) + (alias project-root) (alias promote) (alias quoting) (alias redirections) @@ -740,6 +749,7 @@ (alias output-obj) (alias package-dep) (alias path-variables) + (alias project-root) (alias promote) (alias quoting) (alias redirections) diff --git a/test/blackbox-tests/test-cases/project-root/dune b/test/blackbox-tests/test-cases/project-root/dune new file mode 100644 index 00000000..6b96a2c3 --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/dune @@ -0,0 +1,4 @@ +(alias + (name runtest) + (action (echo "From root: %{project_root}\n")) +) diff --git a/test/blackbox-tests/test-cases/project-root/dune-file/a/b/dune b/test/blackbox-tests/test-cases/project-root/dune-file/a/b/dune new file mode 100644 index 00000000..d5d1c23d --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/dune-file/a/b/dune @@ -0,0 +1,4 @@ +(alias + (name runtest) + (action (echo "From dune-file/a/b/: %{project_root}\n")) +) diff --git a/test/blackbox-tests/test-cases/project-root/dune-file/a/dune b/test/blackbox-tests/test-cases/project-root/dune-file/a/dune new file mode 100644 index 00000000..8c9f2086 --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/dune-file/a/dune @@ -0,0 +1,4 @@ +(alias + (name runtest) + (action (echo "From dune-file/a/: %{project_root}\n")) +) diff --git a/test/blackbox-tests/test-cases/project-root/dune-project b/test/blackbox-tests/test-cases/project-root/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/project-root/jbuild-file/a/b/jbuild b/test/blackbox-tests/test-cases/project-root/jbuild-file/a/b/jbuild new file mode 100644 index 00000000..27bd88d3 --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/jbuild-file/a/b/jbuild @@ -0,0 +1,5 @@ +(alias + ((name runtest) + (action (echo "From jbuild/a/b/: ${SCOPE_ROOT}\n")) + ) + ) diff --git a/test/blackbox-tests/test-cases/project-root/jbuild-file/a/jbuild b/test/blackbox-tests/test-cases/project-root/jbuild-file/a/jbuild new file mode 100644 index 00000000..951834f6 --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/jbuild-file/a/jbuild @@ -0,0 +1,5 @@ +(alias + ((name runtest) + (action (echo "From jbuild/a/: ${SCOPE_ROOT}\n")) + ) + ) diff --git a/test/blackbox-tests/test-cases/project-root/run.t b/test/blackbox-tests/test-cases/project-root/run.t new file mode 100644 index 00000000..b73eef38 --- /dev/null +++ b/test/blackbox-tests/test-cases/project-root/run.t @@ -0,0 +1,9 @@ +%{SCOPE_ROOT} (or ${SCOPE_ROOT} in jbuild files) refers to the root of the +project. + + $ dune runtest + From dune-file/a/b/: ../../.. + From dune-file/a/: ../.. + From jbuild/a/b/: ../../.. + From jbuild/a/: ../.. + From root: .