config: Append works with modules

pull/297/head
Mitchell Hashimoto 12 years ago
parent 610e92cab2
commit e7fe5aa452

@ -29,6 +29,13 @@ func Append(c1, c2 *Config) (*Config, error) {
}
}
if len(c1.Modules) > 0 || len(c2.Modules) > 0 {
c.Modules = make(
[]*Module, 0, len(c1.Modules)+len(c2.Modules))
c.Modules = append(c.Modules, c1.Modules...)
c.Modules = append(c.Modules, c2.Modules...)
}
if len(c1.Outputs) > 0 || len(c2.Outputs) > 0 {
c.Outputs = make(
[]*Output, 0, len(c1.Outputs)+len(c2.Outputs))

@ -12,6 +12,9 @@ func TestAppend(t *testing.T) {
}{
{
&Config{
Modules: []*Module{
&Module{Name: "foo"},
},
Outputs: []*Output{
&Output{Name: "foo"},
},
@ -29,6 +32,9 @@ func TestAppend(t *testing.T) {
},
&Config{
Modules: []*Module{
&Module{Name: "bar"},
},
Outputs: []*Output{
&Output{Name: "bar"},
},
@ -46,6 +52,10 @@ func TestAppend(t *testing.T) {
},
&Config{
Modules: []*Module{
&Module{Name: "foo"},
&Module{Name: "bar"},
},
Outputs: []*Output{
&Output{Name: "foo"},
&Output{Name: "bar"},

Loading…
Cancel
Save