From 8b5e1a9a1324edc216aef6927a4adc2ecc59544f Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 3 Jul 2018 13:54:54 +0700 Subject: [PATCH] Add tests for fallback Signed-off-by: Rudi Grinberg --- test/blackbox-tests/dune.inc | 10 ++++++++++ .../test-cases/fallback-dune/dune1/dune | 4 ++++ .../test-cases/fallback-dune/dune2/dune | 4 ++++ .../test-cases/fallback-dune/jbuild/jbuild | 5 +++++ .../test-cases/fallback-dune/run.t | 20 +++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 test/blackbox-tests/test-cases/fallback-dune/dune1/dune create mode 100644 test/blackbox-tests/test-cases/fallback-dune/dune2/dune create mode 100644 test/blackbox-tests/test-cases/fallback-dune/jbuild/jbuild create mode 100644 test/blackbox-tests/test-cases/fallback-dune/run.t diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc index 28390f9e..efcea69d 100644 --- a/test/blackbox-tests/dune.inc +++ b/test/blackbox-tests/dune.inc @@ -128,6 +128,14 @@ test-cases/exec-cmd (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) +(alias + (name fallback-dune) + (deps (package dune) (source_tree test-cases/fallback-dune)) + (action + (chdir + test-cases/fallback-dune + (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) + (alias (name findlib) (deps (package dune) (source_tree test-cases/findlib)) @@ -606,6 +614,7 @@ (alias env) (alias exclude-missing-module) (alias exec-cmd) + (alias fallback-dune) (alias findlib) (alias findlib-error) (alias force-test) @@ -678,6 +687,7 @@ (alias env) (alias exclude-missing-module) (alias exec-cmd) + (alias fallback-dune) (alias findlib) (alias findlib-error) (alias force-test) diff --git a/test/blackbox-tests/test-cases/fallback-dune/dune1/dune b/test/blackbox-tests/test-cases/fallback-dune/dune1/dune new file mode 100644 index 00000000..020ea118 --- /dev/null +++ b/test/blackbox-tests/test-cases/fallback-dune/dune1/dune @@ -0,0 +1,4 @@ +(rule + (fallback) + (targets) + (action (with-stdout-to foo.txt (echo "testing")))) \ No newline at end of file diff --git a/test/blackbox-tests/test-cases/fallback-dune/dune2/dune b/test/blackbox-tests/test-cases/fallback-dune/dune2/dune new file mode 100644 index 00000000..fdf0a419 --- /dev/null +++ b/test/blackbox-tests/test-cases/fallback-dune/dune2/dune @@ -0,0 +1,4 @@ +(rule + (fallback false) + (targets) + (action (with-stdout-to foo.txt (echo "testing")))) \ No newline at end of file diff --git a/test/blackbox-tests/test-cases/fallback-dune/jbuild/jbuild b/test/blackbox-tests/test-cases/fallback-dune/jbuild/jbuild new file mode 100644 index 00000000..9792612a --- /dev/null +++ b/test/blackbox-tests/test-cases/fallback-dune/jbuild/jbuild @@ -0,0 +1,5 @@ + +(rule + ((fallback) + (targets (foo.txt)) + (action (with-stdout-to foo.txt (echo "testing"))))) diff --git a/test/blackbox-tests/test-cases/fallback-dune/run.t b/test/blackbox-tests/test-cases/fallback-dune/run.t new file mode 100644 index 00000000..27b03976 --- /dev/null +++ b/test/blackbox-tests/test-cases/fallback-dune/run.t @@ -0,0 +1,20 @@ +fallback isn't allowed in dune + + $ dune build --root dune1 + Info: creating file dune-project with this contents: (lang dune 1.0) + File "dune", line 2, characters 1-11: + Error: 'fallback' was renamed to '(mode fallback)' in 1.0 of the dune language + [1] + +2nd fallback form isn't allowed either + + $ dune build --root dune2 + Info: creating file dune-project with this contents: (lang dune 1.0) + File "dune", line 2, characters 1-17: + Error: 'fallback' was renamed to '(mode fallback)' in 1.0 of the dune language + [1] + +But it is allowed in jbuilder + + $ jbuilder build --root jbuild + Entering directory 'jbuild'