From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 074244331D for ; Mon, 13 Nov 2023 19:57:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00E2E4026F; Mon, 13 Nov 2023 19:57:12 +0100 (CET) Received: from mail-ej1-f98.google.com (mail-ej1-f98.google.com [209.85.218.98]) by mails.dpdk.org (Postfix) with ESMTP id 6BAF74026F for ; Mon, 13 Nov 2023 19:57:10 +0100 (CET) Received: by mail-ej1-f98.google.com with SMTP id a640c23a62f3a-9c3aec5f326so1195873666b.1 for ; Mon, 13 Nov 2023 10:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1699901830; x=1700506630; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=dXfG86Hzq0gwuTj4Tq4mDm6eTfCBbeBd6QLhy8CpGiY=; b=gdFtbKgrqBtTVv8oHYuYhV98axUmHgd2N0koykCl/sf4QDYuO6vBU7UffFk1j5+htg FJjH2pkKH2qlXknYNHl0WQl2e3mrdP+O00Muc10JAcMOPpJa3FePdxZvCaXxD24shCwF JcJCXG2a7LuWqxqu5Qft6wltEZB1rI3uSJ8FI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699901830; x=1700506630; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dXfG86Hzq0gwuTj4Tq4mDm6eTfCBbeBd6QLhy8CpGiY=; b=oqAllWTBuVPSUEF53KWdHtYgXGHG7Y4IJh8aWPMhOsh/h5oqDMcMQtJYyb8QjsM1XJ nE3cHLyANCIsXWgL9TGPcJmjXBVXmA2XbAwZDRMxvP+h551rq2bn8ahhGdKlGkx5YObN zi9GSQfXK1TMnIkVZp+EcLy1g39mS8oHZwsztj6YKYFW6x08YA9nkRJD1W1+njkmH9xF o1wszb73hL7Cad5/aC2MmayuVC5Je/8+/EMEJmsdmdbXqB85Ef8J81bawSBIIOlyezNz uy4TfZe0DKm32epSkPcMQ2njBJ8Xp37mRLMUb51oFqrVfDE5eny0S/whOMaA5R5tIQm0 DHww== X-Gm-Message-State: AOJu0YwHsVmqljeMFhWUa1AVXEZKmabs+NkvotdUZplSHdnEkMb8Ay+Y fZfGPt75m3HeO4ONfrM1k3BnEE+m+6wZs3TwcDLMrAp1Uii2tLvZlXa0WQ== X-Google-Smtp-Source: AGHT+IGt96Vdzoi6SJi5QxoWfecAohxCIlSCu9m/T0fEaX1POVMWYcOu/KdeLFARivclV5SiMbId/KVCuW61 X-Received: by 2002:a17:907:9918:b0:9b6:3be9:a8f with SMTP id ka24-20020a170907991800b009b63be90a8fmr361516ejc.20.1699901830048; Mon, 13 Nov 2023 10:57:10 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id lg20-20020a170906f89400b009ddefeeb40bsm1670260ejb.247.2023.11.13.10.57.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Nov 2023 10:57:10 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Mon, 13 Nov 2023 10:57:10 -0800 (PST) Message-ID: <65527186.170a0220.5cea1.864bSMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.2] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id 23CF7605C344; Mon, 13 Nov 2023 13:57:09 -0500 (EST) Subject: |WARNING| pw134167-134171 [PATCH] [v6, 5/5] test: cleanups to pcapng test From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/134167 _apply patch failure_ Submitter: Stephen Hemminger Date: Monday, November 13 2023 16:15:19 Applied on: CommitID:d677a3eb1b4e2d38c193fabd755dac30ee04c2df Apply patch set 134167-134171 failed: Checking patch app/dumpcap/main.c... Checking patch app/test/test_pcapng.c... Checking patch lib/graph/graph_pcap.c... Checking patch lib/pcapng/rte_pcapng.c... Checking patch lib/pcapng/rte_pcapng.h... Hunk #1 succeeded at 114 (offset -7 lines). Hunk #2 succeeded at 126 (offset -8 lines). error: while searching for: * The handle to the packet capture file * @param port * The Ethernet port to report stats on. * @param comment * Optional comment to add to statistics. * @param start_time * The time when packet capture was started in nanoseconds. * Optional: can be zero if not known. * @param end_time * The time when packet capture was stopped in nanoseconds. * Optional: can be zero if not finished; * @param ifrecv * The number of packets received by capture. * Optional: use UINT64_MAX if not known. * @param ifdrop * The number of packets missed by the capture process. * Optional: use UINT64_MAX if not known. * @return * number of bytes written to file, -1 on failure to write file */ __rte_experimental ssize_t rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port, const char *comment, uint64_t start_time, uint64_t end_time, uint64_t ifrecv, uint64_t ifdrop); #ifdef __cplusplus } error: patch failed: lib/pcapng/rte_pcapng.h:188 Checking patch lib/pdump/rte_pdump.c... Applied patch app/dumpcap/main.c cleanly. Applied patch app/test/test_pcapng.c cleanly. Applied patch lib/graph/graph_pcap.c cleanly. Applied patch lib/pcapng/rte_pcapng.c cleanly. Applying patch lib/pcapng/rte_pcapng.h with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Applied patch lib/pdump/rte_pdump.c cleanly. hint: Use 'git am --show-current-patch' to see the failed patch diff a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h (rejected hunks) @@ -188,29 +186,22 @@ rte_pcapng_write_packets(rte_pcapng_t *self, * The handle to the packet capture file * @param port * The Ethernet port to report stats on. - * @param comment - * Optional comment to add to statistics. - * @param start_time - * The time when packet capture was started in nanoseconds. - * Optional: can be zero if not known. - * @param end_time - * The time when packet capture was stopped in nanoseconds. - * Optional: can be zero if not finished; * @param ifrecv * The number of packets received by capture. * Optional: use UINT64_MAX if not known. * @param ifdrop * The number of packets missed by the capture process. * Optional: use UINT64_MAX if not known. + * @param comment + * Optional comment to add to statistics. * @return * number of bytes written to file, -1 on failure to write file */ __rte_experimental ssize_t rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port, - const char *comment, - uint64_t start_time, uint64_t end_time, - uint64_t ifrecv, uint64_t ifdrop); + uint64_t ifrecv, uint64_t ifdrop, + const char *comment); #ifdef __cplusplus } Checking patch lib/pcapng/rte_pcapng.c... error: lib/pcapng/rte_pcapng.c: does not match index hint: Use 'git am --show-current-patch' to see the failed patch Checking patch app/test/meson.build... Checking patch app/test/test_pcapng.c... error: app/test/test_pcapng.c: does not match index Applied patch app/test/meson.build cleanly. hint: Use 'git am --show-current-patch' to see the failed patch https://lab.dpdk.org/results/dashboard/patchsets/28359/ UNH-IOL DPDK Community Lab