Skip to content

Commit

Permalink
Rename a test
Browse files Browse the repository at this point in the history
Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
  • Loading branch information
snowleopard committed Oct 9, 2019
1 parent 94ca484 commit b60f546
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
7 changes: 5 additions & 2 deletions src/dune/dune_file.ml
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,8 @@ module Buildable = struct
( Dune_lang.Syntax.since Stanza.syntax (2, 0)
>>> repeat (located string) )
and+ c_flags =
Ordered_set_lang.Unexpanded.field "c_flags" ?check:(Some (use_foreign >>> check_c (return ())))
Ordered_set_lang.Unexpanded.field "c_flags"
?check:(Some (use_foreign >>> check_c (return ())))
and+ cxx_flags =
Ordered_set_lang.Unexpanded.field "cxx_flags"
?check:(Some (use_foreign >>> check_c (return ())))
Expand Down Expand Up @@ -804,7 +805,8 @@ module Library = struct
(repeat (located Lib_name.decode))
~default:[]
and+ library_flags = Ordered_set_lang.Unexpanded.field "library_flags"
and+ c_library_flags = Ordered_set_lang.Unexpanded.field "c_library_flags"
and+ c_library_flags =
Ordered_set_lang.Unexpanded.field "c_library_flags"
and+ virtual_deps =
field "virtual_deps" (repeat (located Lib_name.decode)) ~default:[]
and+ modes =
Expand Down Expand Up @@ -973,6 +975,7 @@ module Library = struct
[ default_archive_name t ] )
@ List.map ~f:snd t.buildable.foreign_archives

(* TODO_AM: Code duplication. *)
let lib_files t ~dir ~ext_lib =
List.map (archive_names t) ~f:(fun name ->
Path.Build.relative dir (sprintf "lib%s%s" name ext_lib))
Expand Down
2 changes: 1 addition & 1 deletion src/dune/dune_file.mli
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(** Representation and parsing of dune files *)
(** Representation and parsing of Dune files *)

open! Stdune
open Import
Expand Down
20 changes: 10 additions & 10 deletions test/blackbox-tests/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,14 @@
test-cases/foreign-library
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))

(alias
(name foreign-stubs)
(deps (package dune) (source_tree test-cases/foreign-stubs))
(action
(chdir
test-cases/foreign-stubs
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))

(alias
(name format-dune-file)
(deps (package dune) (source_tree test-cases/format-dune-file))
Expand Down Expand Up @@ -642,14 +650,6 @@
test-cases/github1231
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))

(alias
(name github1306)
(deps (package dune) (source_tree test-cases/github1306))
(action
(chdir
test-cases/github1306
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))

(alias
(name github1342)
(deps (package dune) (source_tree test-cases/github1342))
Expand Down Expand Up @@ -1910,13 +1910,13 @@
(alias forbidden_libraries)
(alias force-test)
(alias foreign-library)
(alias foreign-stubs)
(alias format-dune-file)
(alias formatting)
(alias gen-opam-install-file)
(alias github1019)
(alias github1099)
(alias github1231)
(alias github1306)
(alias github1342)
(alias github1372)
(alias github1395)
Expand Down Expand Up @@ -2127,12 +2127,12 @@
(alias forbidden_libraries)
(alias force-test)
(alias foreign-library)
(alias foreign-stubs)
(alias format-dune-file)
(alias formatting)
(alias github1019)
(alias github1099)
(alias github1231)
(alias github1306)
(alias github1342)
(alias github1395)
(alias github1426)
Expand Down

0 comments on commit b60f546

Please sign in to comment.