From nobody Thu Apr 25 22:44:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584615941; cv=none; d=zohomail.com; s=zohoarc; b=aKILFucjLYAYELa/gW/Z67444GWluTB+RQeW/tPaqIqm1pXjbv4CAIpJpUCQ/a+gY5hZk6VsTFGWMNzvhplmCAkCIm8/tlZwJjbK59GhOF7HR13dPdIOEXWHE1ZCsLT2DE05hRe3Ov1TedB9W1iq0W0AHyNfmoIbs9G4AeufJmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584615941; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=a2wxrhW9W/0imz+JIEZqXu5fczB0D9JL5NrxpH/4+Hg=; b=bGJzEpUkvKHJql3KLVHmTr5CR6g+NXjwYqtJ4KiANqVB9HN8hKByz+F/zmykDJmhLriZHWhT6UeDxSJ2QcsV4VtdyGPPebEwiafRoM7GRTrD4q87YYj8cS6YBQVGu8qXtOPSQh2iQ5c4lZ4CvicMtzE7dW96JrkYkyrxmuM1P8c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1584615941844101.11490656472256; Thu, 19 Mar 2020 04:05:41 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-u1WsnijgMtii4LH6wM_RsQ-1; Thu, 19 Mar 2020 07:05:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 765C518C8C04; Thu, 19 Mar 2020 11:05:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DD2271001938; Thu, 19 Mar 2020 11:05:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0976E84460; Thu, 19 Mar 2020 11:05:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02JB5Nh9032084 for ; Thu, 19 Mar 2020 07:05:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7933F8D55E; Thu, 19 Mar 2020 11:05:23 +0000 (UTC) Received: from lindworm.usersys.redhat.com (unknown [10.40.192.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E91D79CA3 for ; Thu, 19 Mar 2020 11:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584615940; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=a2wxrhW9W/0imz+JIEZqXu5fczB0D9JL5NrxpH/4+Hg=; b=foHKSh/yCjaFB4jCuI1oFUCrgeV0XaQx5uyny+ldl7N+Xd23Eiy9cH2fpR5hC3oQjUu1lH iawzWYPJouGOSaxMF+Lbdj60dX2dmVV4d9pzzzUHeSKQonM3XoFYhK9kXHVITtwMShauIF YuS0SMSgMKldNkybX8q0w3C2wYuczK4= X-MC-Unique: u1WsnijgMtii4LH6wM_RsQ-1 From: Pino Toscano To: libvir-list@redhat.com Subject: [PATCH] tests: switch away from HAVE_SOCKETPAIR Date: Thu, 19 Mar 2020 12:05:17 +0100 Message-Id: <20200319110517.1609142-1-ptoscano@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since the removal of gnulib, HAVE_SOCKETPAIR is no more defined, making these two tests effectively skipped. Use the same strategy used in other generic library bits, i.e. exclude the socketpair usage on Windows. Semi-related change in virnetdaemontest.c to make it build: since virutil.h does not include unistd.h anymore, we need to include it. Signed-off-by: Pino Toscano Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/virnetdaemontest.c | 4 +++- tests/virnetserverclienttest.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 825487f0a1..09d268627c 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -18,13 +18,15 @@ =20 #include =20 +#include + #include "testutils.h" #include "virerror.h" #include "rpc/virnetdaemon.h" =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 -#if defined(HAVE_SOCKETPAIR) && defined(WITH_YAJL) +#if !defined(WIN32) && defined(WITH_YAJL) struct testClientPriv { int magic; }; diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index a9a56c48d5..668fd02a1e 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -24,7 +24,7 @@ =20 #define VIR_FROM_THIS VIR_FROM_RPC =20 -#ifdef HAVE_SOCKETPAIR +#ifndef WIN32 =20 static void * testClientNew(virNetServerClientPtr client G_GNUC_UNUSED, --=20 2.25.1