Skip to content

Commit

Permalink
test: formatting cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

<!-- ps-id: 8685e101-d762-489e-a9f6-2c81fc7ac138 -->
  • Loading branch information
rgrinberg committed Aug 6, 2024
1 parent 4b25456 commit 4a7e8d2
Show file tree
Hide file tree
Showing 17 changed files with 258 additions and 263 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
(library
(name examplelib)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
(name examplelib)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
(executable
(name example)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(generated_entry_point C)))
(name example)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(generated_entry_point C)))
26 changes: 13 additions & 13 deletions test/blackbox-tests/test-cases/ctypes/exe-pkg_config.t/dune
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
(executable
(name example)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
(name example)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
(rule
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))

(executable
(name example)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
(c_flags "-Ivendor")))
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(generated_entry_point C)))
(name example)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
(c_flags "-Ivendor")))
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(generated_entry_point C)))
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
(rule
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))

(executable
(name example)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
(c_flags "-Ivendor")))
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_types My_generated_types)
(generated_entry_point C)))
(name example)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
(c_flags "-Ivendor")))
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_types My_generated_types)
(generated_entry_point C)))
49 changes: 24 additions & 25 deletions test/blackbox-tests/test-cases/ctypes/exe-vendored-preamble.t/dune
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
(rule
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))

(executable
(name example)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
(c_flags "-Ivendor")))
(headers (preamble "#include %{read:preamble.sexp}"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
(name example)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
(c_flags "-Ivendor")))
(headers (preamble "#include %{read:preamble.sexp}"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))


(rule
(action (with-stdout-to preamble.sexp (echo "<example.h>")))
)
(action (with-stdout-to preamble.sexp (echo "<example.h>"))))
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
(library
(name examplelib)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(generated_entry_point C)))
(name examplelib)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(generated_entry_point C)))
26 changes: 13 additions & 13 deletions test/blackbox-tests/test-cases/ctypes/lib-pkg_config.t/stubgen/dune
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
(library
(name examplelib)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
(name examplelib)
(flags (:standard -w -9-27))
(ctypes
(external_library_name libexample)
(build_flags_resolver pkg_config)
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(instance Functions)
(functor Function_description))
(generated_entry_point C)))
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(executable
(name example)
(libraries examplelib))
(name example)
(libraries examplelib))
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
(rule
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))
(targets libexample.a dllexample%{ext_dll})
(deps (source_tree vendor))
(action
(no-infer
(progn
(copy vendor/libexample.a libexample.a)
(copy vendor/libexample%{ext_dll} dllexample%{ext_dll})))))

(library
(name examplelib)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
; hack: multiple -I directives to work around cc commands being run from different
; relative directories. Is there a cleaner way to do this?
(c_flags ("-Istubgen/vendor" "-Ivendor"))))
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(generated_entry_point C)))
(name examplelib)
(flags (:standard -w -9-27))
(foreign_archives example)
(ctypes
(external_library_name examplelib)
(build_flags_resolver
(vendored
; hack: multiple -I directives to work around cc commands being run from different
; relative directories. Is there a cleaner way to do this?
(c_flags ("-Istubgen/vendor" "-Ivendor"))))
(headers (include "example.h"))
(type_description
(instance Types)
(functor Type_description))
(function_description
(concurrency sequential)
(instance Functions_sequential)
(functor Function_description_sequential))
(function_description
(concurrency unlocked)
(instance Functions_unlocked)
(functor Function_description_unlocked))
(generated_entry_point C)))
Loading

0 comments on commit 4a7e8d2

Please sign in to comment.