Attention is currently required from: laforge, osmith, pespin.
Hello Jenkins Builder, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email
to look at the new patch set (#5).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder
Change subject: osmo-config-merge: Fix comments with different indentation creating merge problems
......................................................................
osmo-config-merge: Fix comments with different indentation creating merge problems
VTY comments are not part of the tree structure, since they can be
placed anywhere and are just ignored.
Hence, ignore them when generating the tree structure during file read.
This has the backside that of course when merging files, comments on the
0-level show up in the end in testB.ok since the content below it in
testB.confmerge is now merged (properly) into previous nodes.
This can be slightly improved by placing the comments in the proper
indentation level, since if a new node is appended from the .confmerge,
they will be added in order and hence will show up properly.
Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741
---
M tests/osmo-config-merge/testA.ok
M tests/osmo-config-merge/testB.ok
M tests/osmo-config-merge/testB2.ok
M utils/osmo-config-merge.c
4 files changed, 156 insertions(+), 128 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/40296/5
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741
Gerrit-Change-Number: 40296
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Attention is currently required from: fixeria, laforge, pespin.
Hello Jenkins Builder, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email
to look at the new patch set (#8).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: Introduce tests/osmo-config-merge testsuite
......................................................................
Introduce tests/osmo-config-merge testsuite
This allows catching current bugs and possible regressions when fixing
them.
For instance, testB2.ok already shows a bug where lots of lines expected
to be merged under the "cs7 instance 0" end up put in an un expected place.
This happens due to comments being used by osmo-config-merge during tree
creation, and will be fixed in a follow-up commit.
Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9
---
M .gitignore
M configure.ac
M tests/Makefile.am
A tests/osmo-config-merge/Makefile.am
A tests/osmo-config-merge/testA.cfg
A tests/osmo-config-merge/testA.confmerge
A tests/osmo-config-merge/testA.ok
A tests/osmo-config-merge/testB.cfg
A tests/osmo-config-merge/testB.confmerge
A tests/osmo-config-merge/testB.ok
A tests/osmo-config-merge/testB2.cfg
A tests/osmo-config-merge/testB2.confmerge
A tests/osmo-config-merge/testB2.ok
A tests/osmo-config-merge/testsuite.at
14 files changed, 1,095 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/8
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9
Gerrit-Change-Number: 40295
Gerrit-PatchSet: 8
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Attention is currently required from: fixeria, laforge, pespin.
Hello Jenkins Builder, laforge, osmith,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email
to look at the new patch set (#7).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: Introduce tests/osmo-config-merge testsuite
......................................................................
Introduce tests/osmo-config-merge testsuite
This allows catching current bugs and possible regressions when fixing
them.
For instance, testB2.ok already shows a bug where lots of lines expected
to be merged under the "cs7 instance 0" end up put in an un expected place.
This happens due to comments being used by osmo-config-merge during tree
creation, and will be fixed in a follow-up commit.
Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9
---
M .gitignore
M configure.ac
M tests/Makefile.am
A tests/osmo-config-merge/Makefile.am
A tests/osmo-config-merge/atlocal.in
A tests/osmo-config-merge/testA.cfg
A tests/osmo-config-merge/testA.confmerge
A tests/osmo-config-merge/testA.ok
A tests/osmo-config-merge/testB.cfg
A tests/osmo-config-merge/testB.confmerge
A tests/osmo-config-merge/testB.ok
A tests/osmo-config-merge/testB2.cfg
A tests/osmo-config-merge/testB2.confmerge
A tests/osmo-config-merge/testB2.ok
A tests/osmo-config-merge/testsuite.at
15 files changed, 1,095 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/7
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9
Gerrit-Change-Number: 40295
Gerrit-PatchSet: 7
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>