So there is another issue here now:
The nhprd branch doesn’t compile on *BSD systems which makes it
difficult
to test these changes. (and based on Timos comment, the nhprd branch
might be
Linux only code - at least for the time being.
Not complaining, just highlighting the fact that I might not be able to
test
changes based on that branch.
- Martin Winter
On 5 Nov 2015, at 13:46, Martin Winter wrote:
So this seems to be a valid exception.
How would I (or my ci system) know that it's against another
branch/commit?
Any suggestion on how to detect this or mark the patches?
Martin
On November 5, 2015 11:59:32 AM PST, Donald Sharp
<[email protected]> wrote:
Martin -
What's the point of me submitting a patch based against master if I
know a
patch before me will cause it to fail to apply if I submit against
just
master?
Seems circular
donald
On Thu, Nov 5, 2015 at 11:55 AM, Martin Winter <
[email protected]> wrote:
On 5 Nov 2015, at 6:58, Donald Sharp wrote:
My code probably failed to apply because I based this code off of
the
nhprd
code which has changes to zebra_rib.c. I thought it would be best
to
work
off of that because I figured the nhprd code would be in front of
these
changes.
Paul -
Do you have a preference on where you want me to submit these
patches
from?
I would extend this question to everyone here in the community. Not
sure
how many are actually trying out the submitted patches.
I would strongly prefer to have all patches against master (with as
few
exceptions as possible where there is some specific dependency).
Otherwise, how can it be expected for the community to know the base
for
testing it?
Regards,
Martin Winter
[email protected]
On Thu, Nov 5, 2015 at 1:32 AM, <[email protected]> wrote:
Continous Integration Result: FAILED
See below for issues.
This is an EXPERIMENTAL automated CI system.
For questions and feedback, feel free to email
Martin Winter <[email protected]>.
Patches applied :
Patchwork 1441: http://patchwork.quagga.net/patch/1441
[quagga-dev,13497,1/6] zebra: Collapse struct static_ipv[4|6]
into
struct static_route
Patchwork 1438: http://patchwork.quagga.net/patch/1438
[quagga-dev,13494,2/6] zebra: Remove HAVE_IPV6 from rib.h and
zebra_rib.c
Patchwork 1440: http://patchwork.quagga.net/patch/1440
[quagga-dev,13495,3/6] zebra: Combine static_install_ipv[4|6]
Patchwork 1439: http://patchwork.quagga.net/patch/1439
[quagga-dev,13496,4/6] zebra: combine
static_ipv[4|6]_nexthop_same
into one function
Patchwork 1442: http://patchwork.quagga.net/patch/1442
[quagga-dev,13498,5/6] zebra: Combine
static_uninstall_ipv[4|6]
into one function
Patchwork 1443: http://patchwork.quagga.net/patch/1443
[quagga-dev,13499,6/6] zebra: Fix change of distance on ipv6
route
creating duplicate routes
Tested on top of Git : ca8ec20 (as of 20150930.155125 UTC)
CI System Testrun URL:
https://ci1.netdef.org/browse/QUAGGA-QPWORK-166/
Get source and apply patch from patchwork: Failed
----------------
Applying Patchwork patch 1441
------------------------------------
patching file lib/memtypes.c
Hunk #1 succeeded at 82 with fuzz 1 (offset -1 lines).
patching file zebra/rib.h
Hunk #1 succeeded at 168 (offset 2 lines).
Hunk #2 succeeded at 182 (offset 2 lines).
Hunk #3 succeeded at 200 with fuzz 2 (offset 2 lines).
patching file zebra/zebra_rib.c
Hunk #1 succeeded at 2283 (offset 48 lines).
Hunk #2 succeeded at 2313 (offset 48 lines).
Hunk #3 succeeded at 2339 (offset 48 lines).
Hunk #4 succeeded at 2358 (offset 48 lines).
Hunk #5 succeeded at 2376 (offset 48 lines).
Hunk #6 succeeded at 2442 (offset 48 lines).
Hunk #7 succeeded at 2467 (offset 48 lines).
Hunk #8 succeeded at 2485 (offset 48 lines).
Hunk #9 succeeded at 2493 (offset 48 lines).
Hunk #10 succeeded at 2507 (offset 48 lines).
Hunk #11 succeeded at 2536 (offset 48 lines).
Hunk #12 succeeded at 2560 (offset 48 lines).
Hunk #13 succeeded at 2585 (offset 48 lines).
Hunk #14 succeeded at 2830 (offset 47 lines).
Hunk #15 succeeded at 2861 (offset 47 lines).
Hunk #16 succeeded at 2887 (offset 47 lines).
Hunk #17 succeeded at 2906 (offset 47 lines).
Hunk #18 succeeded at 2918 (offset 47 lines).
Hunk #19 succeeded at 2993 (offset 47 lines).
Hunk #20 succeeded at 3018 (offset 47 lines).
Hunk #21 succeeded at 3027 (offset 47 lines).
Hunk #22 succeeded at 3037 (offset 47 lines).
Hunk #23 succeeded at 3080 (offset 47 lines).
Hunk #24 succeeded at 3097 (offset 47 lines).
Hunk #25 succeeded at 3122 (offset 47 lines).
patching file zebra/zebra_vty.c
Hunk #1 succeeded at 2394 (offset -94 lines).
Hunk #2 succeeded at 2417 (offset -94 lines).
Hunk #3 succeeded at 3725 (offset -177 lines).
Hunk #4 succeeded at 3749 (offset -177 lines).
Applying Patchwork patch 1438
------------------------------------
patching file zebra/rib.h
Hunk #1 succeeded at 308 (offset 46 lines).
Hunk #2 succeeded at 320 (offset 46 lines).
Hunk #3 succeeded at 369 (offset 43 lines).
Hunk #4 succeeded at 450 with fuzz 2 (offset 39 lines).
Hunk #5 succeeded at 495 (offset 38 lines).
Hunk #6 succeeded at 519 (offset 38 lines).
patching file zebra/zebra_rib.c
Hunk #1 succeeded at 259 (offset -4 lines).
Hunk #2 succeeded at 304 (offset -4 lines).
Hunk #3 succeeded at 478 (offset 4 lines).
Hunk #4 succeeded at 612 (offset 6 lines).
Hunk #5 succeeded at 879 (offset 6 lines).
Hunk #6 succeeded at 941 (offset 8 lines).
Hunk #7 succeeded at 1001 (offset 8 lines).
Hunk #8 succeeded at 1026 (offset 8 lines).
Hunk #9 FAILED at 1440.
Hunk #10 succeeded at 2585 (offset 48 lines).
Hunk #11 succeeded at 3117 (offset 47 lines).
1 out of 11 hunks FAILED -- saving rejects to file
zebra/zebra_rib.c.rej
Regards,
NetDEF/OpenSourceRouting Continous Integration (CI) System
---
OpenSourceRouting.org is a project of the Network Device Education
Foundation,
For more information, see www.netdef.org and
www.opensourcerouting.org
For questions in regards to this CI System, contact Martin Winter,
[email protected]
--
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
