From patchwork Mon Sep 23 22:16:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Moore X-Patchwork-Id: 11157683 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B82213B1 for ; Mon, 23 Sep 2019 22:16:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 686112064A for ; Mon, 23 Sep 2019 22:16:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore-com.20150623.gappssmtp.com header.i=@paul-moore-com.20150623.gappssmtp.com header.b="EILu0exM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391233AbfIWWQI (ORCPT ); Mon, 23 Sep 2019 18:16:08 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:38192 "EHLO mail-qk1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388785AbfIWWQH (ORCPT ); Mon, 23 Sep 2019 18:16:07 -0400 Received: by mail-qk1-f172.google.com with SMTP id u186so17187749qkc.5 for ; Mon, 23 Sep 2019 15:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=VCyyhXgwSak8shqpKiUPUHfDlITY5P/uHb52D264c7c=; b=EILu0exMnlgw5O4AaqEDuLiIDf2St2K/wq3alCjiuAvGKKA/h2atZ5NmLW1yyk1Vvt uxzcvwGdrKEMiFV5GtnE9MeFgVquhLmD6SFgiiUoFPY1jP8K0v4qNkG9YTGNMmuc4Oi7 yCg4/DWnrvXlEjrJkaQ7nLkUWagQ7U1mZt3yeBf43HIX9QQvMNfajYk+vhOiKsmBdSdp IHh5IMQky84gRfYnM5DNJsaWOD1dakd84Bf8xYZ+K+2ofH1k4GMzTrwW75JYAZ8jTc2L YNQVWwV0+mcgeeTPGWEKqQEneNSNL4U4Dxk22X8wvpGgNzhSL5/VE9li0+pAR4MOACSK RImA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=VCyyhXgwSak8shqpKiUPUHfDlITY5P/uHb52D264c7c=; b=N3VBOwsRnvbQaNkc5bdgNC9mFZgnBCcn541UlTbSWCD0teBtXcS4/HDLnA/RwENVSU q2VEIBLJW3/qa3VGGM5qCi2uiPj2iJcvTBgk4s3THl9e9k0Rtvo2Oo4uekEjbUbTu1+X fmG1e5GKS2ZO6QZsUvvdE91pVHbWgXgR1FAJP1Y2jikXmCtFNkwlkbcgP1lEMJyYL1CS p7JRf+r9Xun3kcVjxmglFOafT8eBXy6mgbiyEucyCuaG3itBSsKMKFcitMCNnJGYEpm8 340bc0LCOunEEFF+Hh78Y/ahmaBTAeqjo4tTJlO+AByS6ek7qiD4S2wNh44xv5F6OTN4 V7tQ== X-Gm-Message-State: APjAAAWy1S4v6ChskXrm2r/p3oaUS2OkFfmXOD0ybWCufxTOC17wHdzu Bq8Prw9VQUCInDfn/ZzNGBFLfx9jbQ== X-Google-Smtp-Source: APXvYqwXGJZDs+FCqxkyPCICIu71I0kI6NQ/s2kKMLTaiBHuSMsD4NI1MBLzjwlhaPe8qzD8qetyPQ== X-Received: by 2002:ae9:edc1:: with SMTP id c184mr203778qkg.336.1569276964771; Mon, 23 Sep 2019 15:16:04 -0700 (PDT) Received: from localhost (static-96-233-112-89.bstnma.ftas.verizon.net. [96.233.112.89]) by smtp.gmail.com with ESMTPSA id t64sm5479247qkc.70.2019.09.23.15.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 15:16:04 -0700 (PDT) From: Paul Moore X-Google-Original-From: Paul Moore Subject: [PATCH 1/2] selinux-testsuite: use our own version of perltidy in the Travis CI tests To: selinux@vger.kernel.org Date: Mon, 23 Sep 2019 18:16:03 -0400 Message-ID: <156927696325.621177.10551869484430505777.stgit@chester> In-Reply-To: <156927687193.621177.11371002337716273956.stgit@chester> References: <156927687193.621177.11371002337716273956.stgit@chester> User-Agent: StGit/0.19-dirty MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: Paul Moore Unfortunately the perltidy results differ between moden distros and the current Travis CI environment. This patch attempts to address this by using the current upstream perltidy in the Travis CI tests. Signed-off-by: Paul Moore --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61bb1f2..256e92c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,17 @@ addons: apt: packages: - astyle - - perltidy - libselinux1-dev - libsctp-dev +before_install: + - git clone https://github.com/perltidy/perltidy.git perltidy + - | + (cd perltidy; + perl Makefile.PL; + make; + sudo make install) + script: - tools/check-syntax -f && git diff --exit-code - make From patchwork Mon Sep 23 22:16:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Moore X-Patchwork-Id: 11157685 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BA3B13B1 for ; Mon, 23 Sep 2019 22:16:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A08B206C2 for ; Mon, 23 Sep 2019 22:16:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore-com.20150623.gappssmtp.com header.i=@paul-moore-com.20150623.gappssmtp.com header.b="vV21aCtq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391241AbfIWWQO (ORCPT ); Mon, 23 Sep 2019 18:16:14 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:41690 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388785AbfIWWQO (ORCPT ); Mon, 23 Sep 2019 18:16:14 -0400 Received: by mail-qt1-f196.google.com with SMTP id x4so19103977qtq.8 for ; Mon, 23 Sep 2019 15:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=c74PYu95r/CDmhWWbpoa5GV4Oi1++gyHA+WdVS6AAEc=; b=vV21aCtqjff2MBX8aA/YFr2M5QSo04xoqH4Kn4+tMlEiLKMiA0xOKeWTtgQihwDBcS vCwyhQyaG7+2sy/gaKf/9OgIs6mr+79g2sBcSeL5a675FIHozCGPzVICjTZJP7zolEkR fpc7E+C9fFlgMVior1bnM8Zo8Wye2dqD1jGxxJCHSie16xQMJHXOunz55MjCDeWVKKBO 23/T6qsrECOzt2kfSsv2XvprI3eiPEVvjXVdjXqMomgS6p4H9dR3D9rGqTlGh2cFUntT t4RB7AJ993j8jRxy9gJGruM3GZUEaE2hjVnqHJ2yW3pwmYsbUxe4uwFEOWOl3tzxswuo 6b/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=c74PYu95r/CDmhWWbpoa5GV4Oi1++gyHA+WdVS6AAEc=; b=J2G3IThBYxfoCDbwNafQzN049BsBV1ADLzb+2uAeOsaTpoZ2FTvJDMRKm5FCjQQpdO A1QlZuRXGfOTQrlwBpA/8anK/mJDm/BycqaLze2D/4EBtCAdVeuXBcO16cOwQV+zVsVY /uPZcGRk4YrnBCMkKE0nPHtMF2j2wASOCZGfP1jE19Ofx/0smFmzja1p8+QO8iy42QGy cXRme2SRn53jKkezQCHjLU/HXH1GarSPNIhs8Efd8VvBBWzrKjLpLbsDEPYSDktu3Msm y4IUqYYB9HC790J1TMWTlbgDjjQDxGDVedAZMpTc7GlnkCTF5f6N5ZGdCWuvOZvu23np dWWw== X-Gm-Message-State: APjAAAVWIwBx4q67IrZUWolycqioCdCsarshyF4cn3OtoF2OZxHc2pMI /2OrzAHJj7+wJ/mxgKlRv2LUwT4Lfg== X-Google-Smtp-Source: APXvYqylKM5kjFMXIxQQFjjq95Cl7TQ/VcDYALw62bNzisEXClzo5VWTXnMul1q/HaJYNDjZoI95dg== X-Received: by 2002:ac8:474c:: with SMTP id k12mr2552645qtp.319.1569276971186; Mon, 23 Sep 2019 15:16:11 -0700 (PDT) Received: from localhost (static-96-233-112-89.bstnma.ftas.verizon.net. [96.233.112.89]) by smtp.gmail.com with ESMTPSA id t65sm6176266qkh.23.2019.09.23.15.16.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2019 15:16:10 -0700 (PDT) From: Paul Moore X-Google-Original-From: Paul Moore Subject: [PATCH 2/2] selinux-testsuite: apply perltidy fixes To: selinux@vger.kernel.org Date: Mon, 23 Sep 2019 18:16:09 -0400 Message-ID: <156927696982.621177.16733723208101241175.stgit@chester> In-Reply-To: <156927687193.621177.11371002337716273956.stgit@chester> References: <156927687193.621177.11371002337716273956.stgit@chester> User-Agent: StGit/0.19-dirty MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: Paul Moore Signed-off-by: Paul Moore --- tests/infiniband_endport/test | 2 +- tests/infiniband_pkey/test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/infiniband_endport/test b/tests/infiniband_endport/test index 0021e0d..f071fbc 100755 --- a/tests/infiniband_endport/test +++ b/tests/infiniband_endport/test @@ -40,7 +40,7 @@ ok( $result, 0 ); foreach (@denied_device_port) { @dev_port_pair = split( / /, $_ ); - $result = system + $result = system "runcon -t test_ibendport_manage_subnet_t smpquery PKeyTable -C $dev_port_pair[0] -P $dev_port_pair[1] -D 1 2>/dev/null"; if ( $result >> 8 eq 0 ) { diff --git a/tests/infiniband_pkey/test b/tests/infiniband_pkey/test index 3ee4d13..382c259 100755 --- a/tests/infiniband_pkey/test +++ b/tests/infiniband_pkey/test @@ -32,7 +32,7 @@ close($f); # The gid sysfs shows a fully expanded ipv6 address, just take the # top half. -@tmp = unpack( '(a20)*', $gid ); +@tmp = unpack( '(a20)*', $gid ); $subnet_prefix = $tmp[0] . ":"; @labeled_pkeys = split( /,/, $conf{SELINUX_INFINIBAND_TEST_LABELED_PKEYS} );