From patchwork Thu Dec 19 10:49:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 182085 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp313362iln; Thu, 19 Dec 2019 02:54:48 -0800 (PST) X-Google-Smtp-Source: APXvYqy9lDN860VSDi76UnZQyU2w3fS2oMNFHtZ/J5jlneAerodxpfDt7eVsT1cNa86g+JYInoGN X-Received: by 2002:ac8:4086:: with SMTP id p6mr6175631qtl.161.1576752888539; Thu, 19 Dec 2019 02:54:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576752888; cv=none; d=google.com; s=arc-20160816; b=vdvcHIJ6V2+DWM4tBZ2GPJe++Ymm5jokJpM5yXZszWoVkzidp2BgXYSYa3Z5O6fc0p YLBVjQE0lbzQ6t1xVIo/coBJwISdcI3HxAuQDcqw8HqPIMkEZM3hkb2sYqdcLK57UI1V ayetPeloBPQ+pZjK2lT9kY0y1AZO5x/Bb1C/9j0XUfvM34McyGKYoDeF/JDZ0BoaSlJB 4IM8ckCdiqjR9kPOmQv2xLRgQTTpI/5Ex0fW4FQ6X6EAUckpz4jVLK39/R5OteWdTwxo 4X41r6jyJeWPBhpeV2Qj8pyFCmxcOIQDmKGkgKBrcpBdpptISQlA8WoE4ms0YwpE8hIN bTng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=q6QACTT6MNs1QawRF/X6ryVYhQD/X9R+o2LVrD4Tw14=; b=Ae7bdZ5ctxHNMVmETrNyQHvrbFV+nS3q0XsTRet1GRAhmmNLTVfGw/W006bTVKUdG+ /CIKvIBo+RH9svh20uc2bjNDVe7U0Wu8u7n9wzArGooONlXpwwCviZWNEJ2IdgpY464f 4nVDkDgD1LeDaX0rhAdkzOurAQGs0kQP4MDtXUz8V/okkp/KENJj8x6z2WsFuPdv5s3L gg2Vg1+fyaUJ24HVbF8xfmBwCAJxivDhcP/iplY0jLp7o3pmwfO/4QiiXbRftyUdz0eX x55o8mFvcTxAShuOYvpMTsvYMu16pRMaplJnVXganKR7U8sXgTinsblLtJz3kqBO5sPN p9wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I7TgzPE0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e6si2701625qtg.254.2019.12.19.02.54.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 02:54:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I7TgzPE0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtSB-00065y-Sh for patch@linaro.org; Thu, 19 Dec 2019 05:54:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39140) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtNL-0006gm-RY for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihtNK-0000CL-MV for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:47 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihtNK-00006z-BP for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id g17so5493194wro.2 for ; Thu, 19 Dec 2019 02:49:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q6QACTT6MNs1QawRF/X6ryVYhQD/X9R+o2LVrD4Tw14=; b=I7TgzPE0szFXokiwAgTKTkzrbZlqX49gLuMLtx84rOsOV0Fmev+rmvopGBVxFnZMSJ ofTsAkyx1sdEgtnwliYCbSOTTrr+R0Ya2maRQ0moIx9MF09IwFgNOXglTGise1K2SNDS VQ/265mb8pT/LC6+RuQnOujs68JL4FlCIM6fV05rvBO6OS1wyc0NzzRedPdvR5wrrdBK Ipz23ptRCUa+Y6CODQJrWrwk30CxGMDQQhCGvtBX0X2FWAyTywpC4mtSJeNavXMuEEbf OFMtFqa/BqMiQLvZEXVrmJO9NpH+ZvRjroS8w6kDr6eaZdkYXMN7b0Ztz5sT4J3iv5vq GCOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q6QACTT6MNs1QawRF/X6ryVYhQD/X9R+o2LVrD4Tw14=; b=NHtDm+K0/Th4Sp6IpUk/jEEWZrv11cX2Vs8FX9XJ0y13wzh2fkjMP5vYw9+F/C38w+ NVaXdtl1F6l5RThjQiu9jeBr5P9S0GfKfCCJJHaJnEDLP4tKA2+qGVQ+aKsAVuVVbP/U 4G87JEjAl/sgA26RR93+GG22AUydG2FqPEAsFGv4i0BfRl6XiWkbWG9nHneEXTE6q78M rfWR9vneZahxLpOux7ZqtVMlUh4GeKQcN9q1ruwRFu/cZF1sTGGtct4bC6oKsWNtVQfm grPVuWyVtTFyn/h9/tzCkrs4ElRhtTYc4iqBUaC25DKqjUK67QrUAIba858POOjC81A/ k0Fg== X-Gm-Message-State: APjAAAWHOo7lVkh/msVgubVXBamn6Hzq5t8XW5zbWoI2PbDXMzqgqaZN 3YoOm2xc/txVEXgAGPoy5VF6uw== X-Received: by 2002:adf:e78a:: with SMTP id n10mr9036693wrm.62.1576752585299; Thu, 19 Dec 2019 02:49:45 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s82sm6075064wms.28.2019.12.19.02.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 02:49:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C2021FF98; Thu, 19 Dec 2019 10:49:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Date: Thu, 19 Dec 2019 10:49:17 +0000 Message-Id: <20191219104934.866-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org> References: <20191219104934.866-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth test-util-filemonitor fails in restricted non-x86 Travis containers since they apparently blacklisted some required system calls there. Let's simply skip the test if we detect such an environment. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa Message-Id: <20191204154618.23560-6-thuth@redhat.com> -- 2.20.1 diff --git a/tests/test-util-filemonitor.c b/tests/test-util-filemonitor.c index 301cd2db619..45009c69f41 100644 --- a/tests/test-util-filemonitor.c +++ b/tests/test-util-filemonitor.c @@ -406,10 +406,21 @@ test_file_monitor_events(void) char *pathdst = NULL; QFileMonitorTestData data; GHashTable *ids = g_hash_table_new(g_int64_hash, g_int64_equal); + char *travis_arch; qemu_mutex_init(&data.lock); data.records = NULL; + /* + * This test does not work on Travis LXD containers since some + * syscalls are blocked in that environment. + */ + travis_arch = getenv("TRAVIS_ARCH"); + if (travis_arch && !g_str_equal(travis_arch, "x86_64")) { + g_test_skip("Test does not work on non-x86 Travis containers."); + return; + } + /* * The file monitor needs the main loop running in * order to receive events from inotify. We must