From 124d94231064d383929524ba7da357f31b076d69 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Wed, 6 Jun 2018 12:03:21 +0100 Subject: [PATCH] s/jbuild/dune/ in misc test Signed-off-by: Jeremie Dimino --- test/blackbox-tests/test-cases/misc/dune | 10 ++++------ test/blackbox-tests/test-cases/misc/run.t | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/test/blackbox-tests/test-cases/misc/dune b/test/blackbox-tests/test-cases/misc/dune index 8629755f..c2620964 100644 --- a/test/blackbox-tests/test-cases/misc/dune +++ b/test/blackbox-tests/test-cases/misc/dune @@ -1,13 +1,11 @@ -(jbuild_version 1) - ;; Test for ${^} with globs in rules (rule ((targets (result expected)) - (deps (jbuild (glob_files *.txt))) + (deps (dune (glob_files *.txt))) (action (progn (with-stdout-to result (echo ${^})) - (with-stdout-to expected (echo "jbuild a.txt b.txt c.txt")))))) + (with-stdout-to expected (echo "dune a.txt b.txt c.txt")))))) (rule ((targets (result2 expected2)) @@ -28,11 +26,11 @@ ;; Test inferred rules -(rule (copy jbuild jbuild-plop)) +(rule (copy dune dune-plop)) (alias ((name runtest) - (deps (jbuild jbuild-plop)) + (deps (dune dune-plop)) (action (run diff -u ${^})))) ;; For some tests in subdirs diff --git a/test/blackbox-tests/test-cases/misc/run.t b/test/blackbox-tests/test-cases/misc/run.t index 514d25e7..42a23831 100644 --- a/test/blackbox-tests/test-cases/misc/run.t +++ b/test/blackbox-tests/test-cases/misc/run.t @@ -1,7 +1,7 @@ $ dune runtest --display short - File "dune", line 65, characters 21-44: + File "dune", line 63, characters 21-44: Warning: Directory dir-that-doesnt-exist doesn't exist. - No rule found for jbuild diff alias runtest diff alias runtest - [1] + diff alias runtest + diff alias runtest