diff --git a/lix/nix/meson.build b/lix/nix/meson.build index 35f1f9fb7..5b6be1060 100644 --- a/lix/nix/meson.build +++ b/lix/nix/meson.build @@ -168,12 +168,7 @@ nix = executable( include_directories : legacy_include_directories, dependencies : [ libasanoptions, - liblixutil, - liblixstore, - liblixfetchers, - liblixexpr, - liblixmain, - liblixcmd, + liblix, boehm, capnp_rpc, nlohmann_json, diff --git a/tests/functional/plugins/meson.build b/tests/functional/plugins/meson.build index 7f8547a7f..3b59a2990 100644 --- a/tests/functional/plugins/meson.build +++ b/tests/functional/plugins/meson.build @@ -2,10 +2,7 @@ libplugintest = shared_module( 'plugintest', 'plugintest.cc', dependencies : [ - liblixutil, - liblixstore, - liblixexpr, - liblixfetchers, + liblix, ], build_by_default : false, link_args : shared_module_link_args, @@ -20,10 +17,7 @@ libplugintestfail = shared_module( 'plugintestfail', 'plugintestfail.cc', dependencies : [ - liblixutil, - liblixstore, - liblixexpr, - liblixfetchers, + liblix, ], cpp_args : ['-DMISSING_REFERENCE'], link_args : shared_module_link_args + libplugintestfail_link_args, diff --git a/tests/functional/repl_characterization/meson.build b/tests/functional/repl_characterization/meson.build index 4eea9a60c..dfafe59b8 100644 --- a/tests/functional/repl_characterization/meson.build +++ b/tests/functional/repl_characterization/meson.build @@ -8,7 +8,7 @@ repl_characterization_tester = executable( repl_characterization_tester_sources, dependencies : [ libasanoptions, - liblixutil, + liblix, liblixutil_test_support, editline, boost, diff --git a/tests/functional/test-libstoreconsumer/meson.build b/tests/functional/test-libstoreconsumer/meson.build index c874026bf..dd23077e6 100644 --- a/tests/functional/test-libstoreconsumer/meson.build +++ b/tests/functional/test-libstoreconsumer/meson.build @@ -3,8 +3,7 @@ libstoreconsumer_tester = executable( 'main.cc', dependencies : [ libasanoptions, - liblixutil, - liblixstore, + liblix, editline, boost, lowdown, diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 960512708..59dfbbe24 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -29,9 +29,7 @@ libutil_test_support = library( 'lixutil-test-support', libutil_test_support_sources, dependencies : [ - liblixutil, - # TODO(Qyriad): libutil tests really should not depend on libexpr... - liblixexpr, + liblix, rapidcheck, ], include_directories : include_directories('libutil-support'), @@ -90,8 +88,7 @@ libutil_tester = executable( libasanoptions, rapidcheck, gtest, - liblixutil, - liblixexpr, + liblix, liblixutil_test_support, nlohmann_json, kj, @@ -122,8 +119,7 @@ libstore_test_support = library( libstore_test_support_sources, dependencies : [ liblixutil_test_support, - liblixutil, - liblixstore, + liblix, rapidcheck, kj, ], @@ -160,8 +156,7 @@ libstore_tester = executable( libasanoptions, liblixstore_test_support, liblixutil_test_support, - liblixstore, - liblixutil, + liblix, rapidcheck, gtest, nlohmann_json, @@ -191,9 +186,7 @@ libexpr_test_support = library( libexpr_test_support_sources, dependencies : [ liblixstore_test_support, - liblixstore, - liblixutil, - liblixexpr, + liblix, rapidcheck, ], include_directories : include_directories( @@ -226,10 +219,7 @@ libexpr_tester = executable( libasanoptions, liblixexpr_test_support, liblixstore_test_support, - liblixstore, - liblixutil, - liblixexpr, - liblixfetchers, + liblix, rapidcheck, gtest, nlohmann_json, @@ -251,15 +241,11 @@ test( ) libcmd_tester = executable( - 'liblixcmd-tests', + 'liblix-tests', files('libcmd/args.cc'), dependencies : [ libasanoptions, - liblixcmd, - liblixutil, - liblixmain, - liblixexpr, - liblixstore, + liblix, gtest, boost, kj, @@ -293,10 +279,7 @@ libmain_tester = executable( 'liblixmain-tests', libmain_tests_sources, dependencies : [ - liblixmain, - liblixexpr, - liblixutil, - liblixstore, + liblix, gtest, boost, kj,