On Tue, Jun 21, 2016 at 06:41:35AM -0400, John Ferlan wrote:
On 06/15/2016 12:39 PM, Ján Tomko wrote:
The --in-place parameter makes the invocation in testutils slightly nicer and --check makes syntax-check faster.
Ján Tomko (8): test-wrap-argv: split out rewrap_line test-wrap-argv: split out rewrap_arg test-wrap-argv: return a string in rewrap_arg test-wrap-argv: use map and join instead of a for cycle test-wrap-argv: return a string in rewrap_line test-wrap-argv: hold a copy of the original file in an array test-wrap-argv: add --in-place parameter test-wrap-argv: add --check parameter
cfg.mk | 12 +--- tests/test-wrap-argv.pl | 170 ++++++++++++++++++++++++++++++------------------ tests/testutils.c | 8 +-- 3 files changed, 108 insertions(+), 82 deletions(-)
I believe one other difference is that "all" the differences or issues are generated and displayed not just one at a time (which I actually prefer).
Changes look OK to me; however, I think an "existing" issue is that the splitting is off by 1 or 2 characters. If a ",", ":", or " " is the 80th character and then a " \" is added, that addition is on the next line if you have a an 80 column display (likewise a "\" when there are more args to be printed).
Check out the following files and you'll note by visual inspection there are lines that are longer than 80:
tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args tests/qemuxml2argvdata/qemuxml2argv-name-escape.args tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args tests/qemuxml2argvdata/qemuxml2argv-pci-many.args tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args
All I did was change 79 to 78 and 80 to 79 (it gets worse with 78/77)
ACK to what's done though...
Thanks, I've pushed the series and marked the issues on my TODO list. Jan