ocaml · rgrinberg · Nov 5, 2019 · Nov 4, 2019 · Nov 4, 2019
diff --git a/doc/concepts.rst b/doc/concepts.rst
@@ -827,14 +827,14 @@ same lock:
 
 .. code:: scheme
 
-    (alias
-     (name   runtest)
+    (rule
+     (alias  runtest)
      (deps   foo)
      (locks  m)
      (action (run test.exe %{deps})))
 
     (alias
-     (name   runtest)
+     (rule   runtest)
      (deps   bar)
      (locks  m)
      (action (run test.exe %{deps})))
@@ -853,8 +853,8 @@ simply use an absolute filename:
 
 .. code:: scheme
 
-    (alias
-     (name   runtest)
+    (rule
+     (alias   runtest)
      (deps   foo)
      (locks  /tcp-port/1042)
      (action (run test.exe %{deps})))
@@ -913,8 +913,8 @@ More precisely, let's consider the following dune file:
    (rule
     (with-stdout-to data.out (run ./test.exe)))
 
-   (alias
-    (name   runtest)
+   (rule
+    (alias   runtest)
     (action (diff data.expected data.out)))
 
 Where ``data.expected`` is a file committed in the source

diff --git a/doc/dune b/doc/dune
@@ -29,7 +29,7 @@
    %{targets}
    (run bash %{dep:update-jbuild.sh}))))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (action
   (diff dune.inc dune.inc.gen)))
diff --git a/doc/dune-files.rst b/doc/dune-files.rst
@@ -1069,8 +1069,8 @@ The typical use of the ``alias`` stanza is to define tests:
 
 .. code:: scheme
 
-    (alias
-     (name   runtest)
+    (rule
+     (alias   runtest)
      (action (run %{exe:my-test-program.exe} blah)))
 
 See the section about :ref:`running-tests` for details.

diff --git a/doc/migration.rst b/doc/migration.rst
@@ -202,8 +202,8 @@ should be rewritten to the following dune file:
 
 .. code:: scheme
 
-          (alias
-           (name   runtest)
+          (rule
+           (alias  runtest)
            (deps   (:x input))
            (action (run ./test.exe %{x})))
 

diff --git a/doc/tests.rst b/doc/tests.rst
@@ -407,8 +407,8 @@ command. For instance let's consider this test:
           (rule
            (with-stdout-to tests.output (run ./tests.exe)))
 
-          (alias
-           (name runtest)
+          (rule
+           (alias runtest)
            (action (diff tests.expected test.output)))
 
 After having run ``tests.exe`` and dumping its output to ``tests.output``, dune

diff --git a/example/dune b/example/dune
@@ -1,7 +1,7 @@
 (data_only_dirs sample-projects)
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (deps
   (package dune)
   (source_tree sample-projects/hello_world))
@@ -12,8 +12,8 @@
     (run %{exe:../test/blackbox-tests/cram.exe} -test run.t)
     (diff? run.t run.t.corrected)))))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (deps
   (package dune)
   (source_tree sample-projects/with-configure-step))

diff --git a/otherlibs/action-plugin/test/depend-on-directory-without-targets/dune b/otherlibs/action-plugin/test/depend-on-directory-without-targets/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/depend-on-directory-without-targets/test/run.t b/otherlibs/action-plugin/test/depend-on-directory-without-targets/test/run.t
@@ -6,8 +6,8 @@
   $ cat > dune << EOF
   > (data_only_dirs some_dir)
   > \
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/dependency-rebuilt-but-not-changed/dune b/otherlibs/action-plugin/test/dependency-rebuilt-but-not-changed/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/dependency-rebuilt-but-not-changed/test/run.t b/otherlibs/action-plugin/test/dependency-rebuilt-but-not-changed/test/run.t
@@ -16,8 +16,8 @@ they were forced to rebuild.
   >   (echo "Building some_file!\n")
   >   (with-stdout-to %{target} (echo "Hello from some_file!")))))
   > \
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/depends-on-directory-with-glob/dune b/otherlibs/action-plugin/test/depends-on-directory-with-glob/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/depends-on-directory-with-glob/test/run.t b/otherlibs/action-plugin/test/depends-on-directory-with-glob/test/run.t
@@ -4,8 +4,8 @@
   > EOF
 
   $ cat > dune << EOF
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/depends-on-its-target-by-read-dir/dune b/otherlibs/action-plugin/test/depends-on-its-target-by-read-dir/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/depends-on-its-target/dune b/otherlibs/action-plugin/test/depends-on-its-target/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/do-not-rebuild-unneeded-dependency/dune b/otherlibs/action-plugin/test/do-not-rebuild-unneeded-dependency/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/do-not-rebuild-unneeded-dependency/test/run.t b/otherlibs/action-plugin/test/do-not-rebuild-unneeded-dependency/test/run.t
@@ -31,8 +31,8 @@ only the dependencies up to this stage are rebuilt.
   >    (echo "Building foo_or_bar!\n")
   >    (copy %{deps} %{target}))))
   > \
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./client.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/multiple-dynamic-run-within-single-action/dune b/otherlibs/action-plugin/test/multiple-dynamic-run-within-single-action/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/no-dependencies/dune b/otherlibs/action-plugin/test/no-dependencies/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/no-dependencies/test/run.t b/otherlibs/action-plugin/test/no-dependencies/test/run.t
@@ -7,8 +7,8 @@ but requires no dependencies can be successfully run.
   > EOF
 
   $ cat > dune << EOF
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/one-absent-dependency/dune b/otherlibs/action-plugin/test/one-absent-dependency/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/one-absent-dependency/test/run.t b/otherlibs/action-plugin/test/one-absent-dependency/test/run.t
@@ -7,8 +7,8 @@ and requires dependency that can not be build fails.
   > EOF
 
   $ cat > dune << EOF
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 
@@ -17,8 +17,8 @@ and requires dependency that can not be build fails.
   $ dune runtest --display short
            foo alias runtest
   File "dune", line 1, characters 0-57:
-  1 | (alias
-  2 |  (name runtest)
+  1 | (rule
+  2 |  (alias runtest)
   3 |  (action (dynamic-run ./foo.exe)))
   Error: No rule found for some_absent_dependency
   [1]
diff --git a/otherlibs/action-plugin/test/one-dependency-with-chdir/dune b/otherlibs/action-plugin/test/one-dependency-with-chdir/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/one-dependency-with-chdir/test/run.t b/otherlibs/action-plugin/test/one-dependency-with-chdir/test/run.t
@@ -7,11 +7,11 @@ when we 'chdir' into different directory.
   > EOF
 
   $ cat > dune << EOF
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action
   >   (chdir some_dir
-  >   (dynamic-run ./foo.exe))))
+  >    (dynamic-run ./foo.exe))))
   > EOF
 
   $ mkdir some_dir

diff --git a/otherlibs/action-plugin/test/one-dependency/dune b/otherlibs/action-plugin/test/one-dependency/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/one-dependency/test/run.t b/otherlibs/action-plugin/test/one-dependency/test/run.t
@@ -11,8 +11,8 @@ and requires one dependency can be successfully run.
   >  (target some_dependency)
   >  (action (with-stdout-to %{target} (echo "Hello from some_dependency!"))))
   > \
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/one-directory-dependency/dune b/otherlibs/action-plugin/test/one-directory-dependency/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/one-directory-dependency/test/run.t b/otherlibs/action-plugin/test/one-directory-dependency/test/run.t
@@ -8,8 +8,8 @@ directory to be build.
   > EOF
 
   $ cat > dune << EOF
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/one-target/dune b/otherlibs/action-plugin/test/one-target/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/one-target/test/run.t b/otherlibs/action-plugin/test/one-target/test/run.t
@@ -9,8 +9,8 @@
   >  (action
   >   (dynamic-run ./foo.exe)))
   > \
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (cat some_target)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/one-undeclared-target/dune b/otherlibs/action-plugin/test/one-undeclared-target/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)

diff --git a/otherlibs/action-plugin/test/one-undeclared-target/test/run.t b/otherlibs/action-plugin/test/one-undeclared-target/test/run.t
@@ -4,8 +4,8 @@
   > EOF
 
   $ cat > dune << EOF
-  > (alias
-  >  (name runtest)
+  > (rule
+  >  (alias runtest)
   >  (action (dynamic-run ./foo.exe)))
   > EOF
 

diff --git a/otherlibs/action-plugin/test/ordinary-executable/dune b/otherlibs/action-plugin/test/ordinary-executable/dune
@@ -1,7 +1,7 @@
 (data_only_dirs test)
 
-(alias
- (name run_dynamic)
+(rule
+ (alias run_dynamic)
  (deps
   (package dune)
   (source_tree test/)