From patchwork Tue Mar 13 15:01:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 885164 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 400yjg10ywz9sT8 for ; Wed, 14 Mar 2018 02:01:26 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 4A36B3E7844 for ; Tue, 13 Mar 2018 16:01:24 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id 3F5433E7729 for ; Tue, 13 Mar 2018 16:01:21 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 98AAD600A6A for ; Tue, 13 Mar 2018 16:01:20 +0100 (CET) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 38BD8AF3C; Tue, 13 Mar 2018 15:01:20 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Tue, 13 Mar 2018 16:01:10 +0100 Message-Id: <20180313150111.16501-2-pvorel@suse.cz> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313150111.16501-1-pvorel@suse.cz> References: <20180313150111.16501-1-pvorel@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Cc: LianWen Sun Subject: [LTP] [PATCH v2 2/3] lib: TCONF on "not supported" errnos in SAFE_SOCKET() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" *NOSUPPORT errnos likely mean there is configuration issue rather than test failure. e.g. missing dccp module in netstress.c which was so far set as TBROK: safe_net.c:117: BROK: netstress.c:654: socket(10, 6, 33) failed: ESOCKTNOSUPPORT Signed-off-by: Petr Vorel Acked-by: Alexey Kodanev Signed-off-by: Petr Vorel <pvorel@suse.cz> Acked-by: Alexey Kodanev <alexey.kodanev@oracle.com> --- lib/safe_net.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/safe_net.c b/lib/safe_net.c index 9ea9d2b42..9ed52dcd1 100644 --- a/lib/safe_net.c +++ b/lib/safe_net.c @@ -107,12 +107,24 @@ int tst_getsockport(const char *file, const int lineno, int sockfd) int safe_socket(const char *file, const int lineno, void (cleanup_fn)(void), int domain, int type, int protocol) { - int rval; + int rval, ttype; rval = socket(domain, type, protocol); if (rval < 0) { - tst_brkm(TBROK | TERRNO, cleanup_fn, + switch (errno) { + case EPROTONOSUPPORT: + case ESOCKTNOSUPPORT: + case EOPNOTSUPP: + case EPFNOSUPPORT: + case EAFNOSUPPORT: + ttype = TCONF; + break; + default: + ttype = TBROK; + } + + tst_brkm(ttype | TERRNO, cleanup_fn, "%s:%d: socket(%d, %d, %d) failed", file, lineno, domain, type, protocol); }