Skip to content

Commit 0697a39

Browse files
committed
Do not rely on command prefixes in tests
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
1 parent f39cbe0 commit 0697a39

File tree

3 files changed

+19
-22
lines changed
  • test/blackbox-tests/test-cases

3 files changed

+19
-22
lines changed

test/blackbox-tests/test-cases/findlib-dynload.t/run.t

+10-10
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@
5151
b: called
5252
a: called
5353

54-
$ dune exe mytool_auto
55-
m: init
56-
a: init
57-
b: init
58-
b: registering
59-
b: called
60-
a: called
54+
$ dune exec mytool_auto
55+
dune: unknown command `exe'.
56+
Usage: dune COMMAND ...
57+
Try `dune --help' for more information.
58+
[1]
6159

62-
$ dune exe mytool c_thread
63-
m: init
64-
c_thread: registering
60+
$ dune exec mytool c_thread
61+
dune: unknown command `exe'.
62+
Usage: dune COMMAND ...
63+
Try `dune --help' for more information.
64+
[1]
6565

6666
$ cat _build/default/.main.eobjs/findlib_initl.ml-gen
6767
Findlib.record_package Findlib.Record_core "mytool";;

test/blackbox-tests/test-cases/format-dune-file.t/run.t

+4-3
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ Files in OCaml syntax are copied verbatim (but error when passed in stdin).
162162
163163
Non 0 error code:
164164
165-
$ echo "(" | dune format ; echo $?
166-
File "", line 2, characters 0-0:
167-
Error: unclosed parenthesis at end of input
165+
$ echo "(" | dune format-dune-file ; echo $?
166+
dune: unknown command `format'.
167+
Usage: dune COMMAND ...
168+
Try `dune --help' for more information.
168169
1

test/blackbox-tests/test-cases/pipe-actions.t/run.t

+5-9
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,11 @@ The makefile version of pipe actions uses actual pipes:
5252
> (pipe-outputs (run a) (run b) (run c)))))
5353
> EOF
5454

55-
$ dune rule -m target
56-
_build/default/target: _build/install/default/bin/a \
57-
_build/install/default/bin/b _build/install/default/bin/c
58-
mkdir -p _build/default; \
59-
mkdir -p _build/default; \
60-
cd _build/default; \
61-
../install/default/bin/a 2>&1 | \
62-
../install/default/bin/b | ../install/default/bin/c &> target
63-
55+
$ dune rules -m target
56+
dune: unknown command `rule'.
57+
Usage: dune COMMAND ...
58+
Try `dune --help' for more information.
59+
[1]
6460
$ cat >dune <<EOF
6561
> (executable
6662
> (public_name apl) (name append_to_line) (modules append_to_line))

0 commit comments

Comments
 (0)