diff --git a/tests/wp/conf/wireplumber.conf b/tests/wp/conf/wireplumber.conf index 86c3b870..9769fac2 100644 --- a/tests/wp/conf/wireplumber.conf +++ b/tests/wp/conf/wireplumber.conf @@ -1,6 +1,3 @@ -context.modules = [ - { name = libpipewire-module-protocol-native } -] wireplumber.section.array.boolean = [ true, false ] @@ -36,6 +33,7 @@ wireplumber.section-merged.array.string = [ "first" ] wireplumber.section-merged.object = { key.boolean = false key.int = 6 + key.string = "not-merged" } wireplumber.section-merged.array.array = [ [true] ] @@ -50,7 +48,7 @@ wireplumber.section-nested-merged = { } wireplumber.section-override = { - "key1" = true; + "key1" = true } wireplumber.section-nested-override = { diff --git a/tests/wp/conf/wireplumber.conf.d/merge.conf b/tests/wp/conf/wireplumber.conf.d/merge.conf index e5569ce7..fb747bdf 100644 --- a/tests/wp/conf/wireplumber.conf.d/merge.conf +++ b/tests/wp/conf/wireplumber.conf.d/merge.conf @@ -25,13 +25,3 @@ wireplumber.section-nested-merged = { } nested-array = [3, 4] } - -override.wireplumber.section-override = { - "key2" = 5; -} - -wireplumber.section-nested-override = { - override.nested-object = { - key2 = 3 - } -} diff --git a/tests/wp/conf/wireplumber.conf.d/merge2.conf b/tests/wp/conf/wireplumber.conf.d/merge2.conf new file mode 100644 index 00000000..b57c5414 --- /dev/null +++ b/tests/wp/conf/wireplumber.conf.d/merge2.conf @@ -0,0 +1,10 @@ +{ + "override.wireplumber.section-override": { + "key2": 5 + }, + "wireplumber.section-nested-override": { + "override.nested-object": { + "key2": 3 + } + } +}