Update tests to use local zanuda executable. Related to #57

Signed-off-by: Kakadu <[email protected]>
Kakadu · Jul 26, 2024 · 0581284 · 0581284
1 parent a725810
commit 0581284
Show file tree

Hide file tree

Showing 36 changed files with 67 additions and 42 deletions.
diff --git a/tests/commandline.t b/tests/commandline.t
@@ -1,15 +1,16 @@
-  $ zanuda --help > /dev/null
+$ which zanuda
+  $ untyped/zanuda.exe --help > /dev/null
 Check untyped AST in file could be doable, but currently is almost dead.
 Typed AST provide much more information
   $ touch empty.ml
-  $ zanuda -I . -dump empty.ml -o /dev/null -del-prefix / -add-prefix / > /dev/null
+  $ untyped/zanuda.exe -I . -dump empty.ml -o /dev/null -del-prefix / -add-prefix / > /dev/null
 Golint format currently is not used
-  $ zanuda -ogolint 1.golint > /dev/null
-  $ zanuda -dump-lints 1.json 2> /dev/null
-  $ zanuda -o file.out -v 2> /dev/null
+  $ untyped/zanuda.exe -ogolint 1.golint > /dev/null
+  $ untyped/zanuda.exe -dump-lints 1.json 2> /dev/null
+  $ untyped/zanuda.exe -o file.out -v 2> /dev/null
 Testing config file
   $ echo  '-no-no-topelevel-eval\nasdf' > .zanuda
-  $ zanuda -o file.out -v 2> /dev/null
+  $ untyped/zanuda.exe -o file.out -v 2> /dev/null
   $ rm -fr .zanuda
 
-  $ zanuda -dump > /dev/null
+  $ untyped/zanuda.exe -dump > /dev/null
diff --git a/tests/dune b/tests/dune
@@ -1,2 +1,6 @@
 (cram
  (applies_to :whole_subtree))
+
+(cram
+ (applies_to commandline)
+ (deps untyped/zanuda.exe))
diff --git a/tests/typed/Equality.t/run.t b/tests/typed/Equality.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-match_bool -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-match_bool -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Equality.ml", line 1, characters 11-36:
   1 | let __ x = if x = None then 1 else 1
                  ^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/Eta.t/run.t b/tests/typed/Eta.t/run.t
@@ -4,7 +4,7 @@
                            ^
   Error (warning 27 [unused-var-strict]): unused variable x.
   [1]
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir . -ordjsonl /dev/null
+  $ ../zanuda.exe  -no-check-filesystem -no-top_file_license -dir . -ordjsonl /dev/null
   File "Eta.ml", line 3, characters 12-23:
   3 | let wrapper x = my_id x
                   ^^^^^^^^^^^

diff --git a/tests/typed/ExcTry.t/run.t b/tests/typed/ExcTry.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "ExcTryWithWildcard.ml", lines 2-3, characters 2-11:
   2 | ..try raise Not_found
   3 | with _ -> 1

diff --git a/tests/typed/Ignore.t/run.t b/tests/typed/Ignore.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir . -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir . -ordjsonl /dev/null
   File "Ignore.ml", line 2, characters 2-29:
   2 |   ignore (List.map ((+)1) xs);
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/License.t/run.t b/tests/typed/License.t/run.t
@@ -1,6 +1,6 @@
   $ dune build @default ./REPL.exe
 
-  $ zanuda -no-check-filesystem -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -dir .  -ordjsonl /dev/null
   module "Asdf__" is omitted
   File "REPL.ml", line 1, characters 0-9:
   1 | open List

diff --git a/tests/typed/ListFusion.t/run.t b/tests/typed/ListFusion.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "ListFusion.ml", line 1, characters 12-48:
   1 | let __ xs = List.map Fun.id (List.map Fun.id xs)
                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -24,3 +24,4 @@
   as
   	'List.concat_map f xs'
 
+
diff --git a/tests/typed/MatchBool.t/run.t b/tests/typed/MatchBool.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-propose_function_untyped -no-top_file_license -no-propose_function -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-propose_function_untyped -no-top_file_license -no-propose_function -dir .  -ordjsonl /dev/null
   File "MatchBool.ml", lines 1-3, characters 20-14:
   1 | ....................match a with 
   2 |   | true -> 1

diff --git a/tests/typed/Mutually_rec_types.t/run.t b/tests/typed/Mutually_rec_types.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Mutually_rec_types.ml", lines 3-9, characters 2-19:
   3 | ..type t1 =
   4 |   | A of

diff --git a/tests/typed/Record1.t/run.t b/tests/typed/Record1.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Record2.ml", line 6, characters 16-36:
   6 | let t_of_t0 f = { e=f.e; g=f.g; h=1}
                       ^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/StringConcat.t/run.t b/tests/typed/StringConcat.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir . -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir . -ordjsonl /dev/null
   File "StringConcat.ml", line 6, characters 8-26:
   6 | let _ = List.fold_left (^)
               ^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/ToplevelEval.t/run.t b/tests/typed/ToplevelEval.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -with-no_toplevel_eval  -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -with-no_toplevel_eval  -dir .  -ordjsonl /dev/null
   File "test_toplevel_eval.ml", line 1, characters 0-3:
   1 | 1+1;;
       ^^^

diff --git a/tests/typed/Tuple_matching.t/run.t b/tests/typed/Tuple_matching.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-check-filesystem -no-top_file_license -no-propose_function -no-propose_function_untyped -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -no-propose_function -no-propose_function_untyped -dir .  -ordjsonl /dev/null
   File "Tuple_matching.ml", lines 2-3, characters 2-18:
   2 | ..match scru with
   3 |   | (_, _) -> true

diff --git a/tests/typed/amb_cstrs.t/run.t b/tests/typed/amb_cstrs.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "amb_cstrs.ml", lines 2-4, characters 2-14:
   2 | ..type 'a result = 
   3 |     | Error of string 

diff --git a/tests/typed/ast.t/run.t b/tests/typed/ast.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Parsetree.mli", line 2, characters 2-16:
   2 |   | App of t * t
         ^^^^^^^^^^^^^^

diff --git a/tests/typed/dune b/tests/typed/dune
@@ -3,4 +3,10 @@
  (modules exec1))
 
 (cram
- (deps %{bin:zanuda}))
+ (deps ./zanuda.exe))
+
+(rule
+ (deps %{project_root}/src/main.exe)
+ (target zanuda.exe)
+ (action
+  (copy %{deps} %{target})))
diff --git a/tests/typed/failwith.t/run.t b/tests/typed/failwith.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Failwith.ml", line 1, characters 12-20:
   1 | let foo _ = failwith "not implemented"
                   ^^^^^^^^

diff --git a/tests/typed/filesystem.t/run.t b/tests/typed/filesystem.t/run.t
@@ -1,3 +1,3 @@
   $ dune build
-  $ zanuda -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-top_file_license -dir .  -ordjsonl /dev/null
   File '_build/default/No_iface.ml' doesn't have corresponding .mli interface
diff --git a/tests/typed/format.t/run.t b/tests/typed/format.t/run.t
@@ -1,5 +1,5 @@
-  $ dune build 2>&1 #| sed 's/test_Format.ml\[[[:digit:]]\+,[[:digit:]]\++[[:digit:]]\+\]//g'  
-  $ zanuda -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ dune build 2>&1 #| sed 's/test_Format.ml\[[[:digit:]]\+,[[:digit:]]\++[[:digit:]]\+\]//g'
+  $ ../zanuda.exe -no-top_file_license -dir .  -ordjsonl /dev/null
   File "test_Format.ml", line 1, characters 25-35:
   1 | let _1 x = Format.printf "a\"%s\"b" x 
                                ^^^^^^^^^^

diff --git a/tests/typed/function.t/run.t b/tests/typed/function.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -no-propose_function -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -no-propose_function -dir .  -ordjsonl /dev/null
   File "Function.ml", line 1, characters 23-56:
   1 | let should_give_a_lint x = match x with [] -> 1 | _ -> 2
                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/hashtables.t/run.t b/tests/typed/hashtables.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Hashtables.ml", line 3, characters 22-23:
   3 |   if None = None then h else h
                             ^

diff --git a/tests/typed/ifbool.t/run.t b/tests/typed/ifbool.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "IfBool.ml", line 2, characters 2-23:
   2 |   if true then 1 else 2
         ^^^^^^^^^^^^^^^^^^^^^
@@ -25,3 +25,4 @@
                 ^^^^^^^^^^^^
   Alert zanuda-linter: Conjunction with boolean smells bad
 
+
diff --git a/tests/typed/list_len.t/run.t b/tests/typed/list_len.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "list_len.ml", line 1, characters 12-30:
   1 | let __ xs = List.length xs < 0
                   ^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/monad_laws.t/run.t b/tests/typed/monad_laws.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-check-filesystem -no-eta_reduction -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-eta_reduction -no-top_file_license -dir .  -ordjsonl /dev/null
   File "laws.ml", line 5, characters 12-35:
   5 | let foo x = x >>= fun y -> return y
                   ^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/typed/nested_if.t/run.t b/tests/typed/nested_if.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "Nested_if.ml", line 5, characters 2-77:
   5 |   if x then (if x then (if x then (if x then x else y) else y) else y) else y
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/untyped/ast_docs.t/run.t b/tests/untyped/ast_docs.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File '_build/default/.test_dollar.objs/byte/ast.cmti' doesn't exist. Maybe some of source files are not compiled?
   File "ast.mli", lines 1-4, characters 0-17:
   1 | type exprA =

diff --git a/tests/untyped/dollar.t/run.t b/tests/untyped/dollar.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-top_file_license -dir .  -ordjsonl /dev/null
   File "dollar.ml", line 4, characters 2-21:
   4 |   pp @@ { field = 1 };;
         ^^^^^^^^^^^^^^^^^^^

diff --git a/tests/untyped/dune b/tests/untyped/dune
@@ -1,2 +1,8 @@
 (cram
- (deps %{bin:zanuda}))
+ (deps ./zanuda.exe))
+
+(rule
+ (deps %{project_root}/src/main.exe)
+ (target zanuda.exe)
+ (action
+  (copy %{deps} %{target})))
diff --git a/tests/untyped/manual_fold.t/run.t b/tests/untyped/manual_fold.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-eta_reduction -no-top_file_license -no-propose_function_untyped -no-propose_function -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-eta_reduction -no-top_file_license -no-propose_function_untyped -no-propose_function -dir .  -ordjsonl /dev/null
   File "manual_fold.ml", lines 2-5, characters 0-39:
   2 | let rec fold_left f acc l =
   3 |   match l with

diff --git a/tests/untyped/manual_map.t/run.t b/tests/untyped/manual_map.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda  -no-check-filesystem -no-top_file_license -no-propose_function_untyped -no-propose_function -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe  -no-check-filesystem -no-top_file_license -no-propose_function_untyped -no-propose_function -dir .  -ordjsonl /dev/null
   File "manual_map.ml", lines 2-4, characters 0-31:
   2 | let rec map1 f = function 
   3 |   | [] -> []

diff --git a/tests/untyped/var_should_not_be_used.t/run.t b/tests/untyped/var_should_not_be_used.t/run.t
@@ -1,5 +1,5 @@
   $ dune build
-  $ zanuda -no-check-filesystem -no-eta_reduction -no-top_file_license -dir .  -ordjsonl /dev/null
+  $ ../zanuda.exe -no-check-filesystem -no-eta_reduction -no-top_file_license -dir .  -ordjsonl /dev/null
   File "lib.ml", line 1, characters 8-12:
   1 | let rec _foo x = _foo x
               ^^^^

diff --git a/tests/unused_func/Inline_tests.t/run.t b/tests/unused_func/Inline_tests.t/run.t
@@ -2,6 +2,6 @@
   $ dune test
 $ dune describe
 
-  $ zanuda -unused-decls . |grep -v "Base\|Angstrom\|Ppx_deriving_runtime"
+  $ ../zanuda.exe -unused-decls . |grep -v "Base\|Angstrom\|Ppx_deriving_runtime"
   Unused declarations:
    0: Nonwrapped.nonwrapped_fac
diff --git a/tests/unused_func/Only_mli.t/run.t b/tests/unused_func/Only_mli.t/run.t
@@ -2,7 +2,7 @@
 $ dune describe
   $ dune exec ./only_mli_demo.exe #-j1 --verbose
   my_id 5 = 5
-  $ zanuda -unused-decls .
+  $ ../zanuda.exe -unused-decls .
   module "Only_mli_lib" is omitted
   Unused declarations:
    0: A.incr

diff --git a/tests/unused_func/Simple.t/run.t b/tests/unused_func/Simple.t/run.t
@@ -1,6 +1,6 @@
   $ dune build @check
 $ dune describe
-  $ zanuda -unused-decls .
+  $ ../zanuda.exe -unused-decls .
   module "Custom_lib" is omitted
   Unused declarations:
    0: Simple.Meow.meow

diff --git a/tests/unused_func/dune b/tests/unused_func/dune
@@ -1,2 +1,8 @@
 (cram
- (deps %{bin:zanuda}))
+ (deps ./zanuda.exe))
+
+(rule
+ (deps %{project_root}/src/main.exe)
+ (target zanuda.exe)
+ (action
+  (copy %{deps} %{target})))