aboutsummaryrefslogtreecommitdiffstats
path: root/test/suite-mergecap.sh
AgeCommit message (Collapse)AuthorFilesLines
2016-02-03suite-mergecap: fix indent (use tabs)Alexis La Goutte1-156/+156
Change-Id: I9b3fb7d09d8dc90366167b1072dcdd4efc6f0516 Reviewed-on: https://code.wireshark.org/review/13684 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-03Suite test: fix modelines for bash script (emac)Alexis La Goutte1-1/+1
c-basic-offset -> sh-basic-offset Change-Id: I16b19b608fbdb7f0408f7c31871fae746c8c4f50 Reviewed-on: https://code.wireshark.org/review/13683 Reviewed-by: cedric izoard <cedric.izoard@ceva-dsp.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-20Get the windows buildbot working for mergecap test suiteHadriel Kaplan1-15/+15
Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767 Reviewed-on: https://code.wireshark.org/review/10141 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Try to debug merge test suite failure on windows buildbotHadriel Kaplan1-6/+13
This change will be undone once the problem is found. Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1 Reviewed-on: https://code.wireshark.org/review/10136 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Mergecap: add test suite for various merging scenariosHadriel Kaplan1-0/+259
Add a test suite for mergecap (and indirectly capinfos I guess). This is not exhaustive, but it's a start. Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e Reviewed-on: https://code.wireshark.org/review/10082 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>