From patchwork Fri Jan 4 14:50:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 154783 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp696250ljp; Fri, 4 Jan 2019 06:50:21 -0800 (PST) X-Received: by 2002:a05:6000:12c4:: with SMTP id l4mr43092556wrx.134.1546613421693; Fri, 04 Jan 2019 06:50:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546613421; cv=none; d=google.com; s=arc-20160816; b=JaI/phwLKOY1/k3Gyqg2fAu7hgS6jwDXkRoDNK5ExL2gAt8sm30cE/3/I2mdy4WU7w w/TYs83RFIrawO2xCS8UAriYZhz0HHhJNggshxAP5vZRJI19W1xcysiuskccRXUI+mmA JNENibU1Flxq82TOxiXSX/A9yPCqi/3hMSonyMRuA+DgYYasasSytxAe/H++8MIUmFNS 51V0NFPoE08uSrs3WgTlJuWu4skfsPdNvJUVbugO/V10yuSrDJcOsJH2u1KwbyyG8uy5 ZcwcmFo9YaTDoN0dilROxdaLsfdSFBlS2w0Ompt8n6b2g+2rwJ1nAw6lkjnnFZz01/Lz Zr7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=8r96HUAxK9l0LtrrF1BLqhlMVgiHZXEjOYg+Ln/WEeQ=; b=MYwNKn43oKetnPEgId5GWGgW7FO+yDrCkh4dcm3hVof30uuGaeTf4Wmzgea6jIkoEv p1VflK219GZXy4mWOzLVkx/urDtGMHq7V0x6SMTZ9EOYy1C2xliD6+WnL/CbnP22m9a4 /pEnQxYuefwDdCJTO2yG1VKG3G39z81l/RxsT8SkZL1uDHdCBcC6jLZRnc1Ka9jLPLyO y4oSLw3vcf9vzvqGgF924UYUMF+RSEBro08fpI181aD49ip/rkUtxqyypivqgAYe2yVi HjHfIh/ddGteoQGX3Jft1D2/uNICUnlU2jsuhtIQXO7v1R6GLLHW8YdMO//BB3w0+H1f p84Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AQhcd6FA; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b3sor30724021wrn.50.2019.01.04.06.50.21 for (Google Transport Security); Fri, 04 Jan 2019 06:50:21 -0800 (PST) Received-SPF: pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AQhcd6FA; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8r96HUAxK9l0LtrrF1BLqhlMVgiHZXEjOYg+Ln/WEeQ=; b=AQhcd6FARyCMS4qTxW3rvftGEuXtpQyMS8fYLP15jc9PJ/FXurypEoh7Km35Vx73YA h8w96Xa3WilNRdiUdAYbeCWl+0CHAZvA2MmNdncHqu1lhn3ksB54uBkruyh+WFT34P4b LGyN+coEQmXBFBApPEOPGZYeheBeOq9G4KEII= 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:mime-version :content-transfer-encoding; bh=8r96HUAxK9l0LtrrF1BLqhlMVgiHZXEjOYg+Ln/WEeQ=; b=QOKiF1iLyxsjBGxrUT7WHmw4Dn3E5tNLjspDwTcAy56dHX9DQGVgKi08db/4UvmRDM efXsauYKDSaDo63HfEjCX4/ftn9DkQPHShlHwnQHAIF461l70JhGuSkeCxpAP6TM6IBb HepaSnSfzNtKUvFUCU5zpiJp3M9+sagphvC5ric54FjH6JEvtQcN/VBsYEJKEfzyy7f2 84sftxaqIJ1wdI/AlBx4cKiViQ3ZoTv2pDjcNFR/MKi+7Q9woOXSMAidT7xHpKJNpGTq 2g3+9PhFgDCGIJoaeWNqQLJir/bMgWHd4phrenktg+IXM4cygo184Z0D9b9+/2mCOtPg NtlA== X-Gm-Message-State: AJcUukcyh2zARGaUxLKvhNLkJUruxPxbRGghAffagznkfYvElivWqs1X PY6XrplbVH1SrPURWqehdTqiSwB8 X-Google-Smtp-Source: ALg8bN4tx5fNZMVqBegLq6rVS0oH6TwZ4Y5d9qcLCyNYJ0CEvsSWmKB8+eojI6blfoCtzHcmuElQ9Q== X-Received: by 2002:adf:d112:: with SMTP id a18mr46669041wri.17.1546613421297; Fri, 04 Jan 2019 06:50:21 -0800 (PST) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a62sm926540wmf.47.2019.01.04.06.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Jan 2019 06:50:20 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Su Hang , Paolo Bonzini Subject: [PATCH] tests/hexloader-test: Don't pass -nographic to the QEMU under test Date: Fri, 4 Jan 2019 14:50:18 +0000 Message-Id: <20190104145018.16950-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 The hexloader test invokes QEMU with the -nographic argument. This is unnecessary, because the qtest_initf() function will pass it -display none, which suffices to disable the graphical window. It also means that the QEMU process will make the stdin/stdout O_NONBLOCK. Since O_NONBLOCK is not per-file descriptor but per "file description", this non-blocking behaviour is then shared with any other process that's using the stdin/stdout of the 'make check' run, including make itself. This can result in make falling over with "make: write error: stdout" because it got an unexpected EINTR trying to write output messages to the terminal. This is particularly noticable if running 'make check' in a loop with while make check; do true; done (It does not affect single make check runs so much because the shell will remove the O_NONBLOCK status before it reads the terminal for interactive input.) Remove the unwanted -nographic argument. Signed-off-by: Peter Maydell --- This seems to be sufficient to resolve my "make falls over" issues with the current test harness and a build done for arm targets; I haven't checked whether other test cases which are specific to other target architectures might have similar accidental O_NONBLOCK behaviour. tests/hexloader-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.2 Reviewed-by: Thomas Huth diff --git a/tests/hexloader-test.c b/tests/hexloader-test.c index 834ed52c22b..8b7aa2d72d0 100644 --- a/tests/hexloader-test.c +++ b/tests/hexloader-test.c @@ -23,7 +23,7 @@ static void hex_loader_test(void) const unsigned int base_addr = 0x00010000; QTestState *s = qtest_initf( - "-M vexpress-a9 -nographic -device loader,file=tests/data/hex-loader/test.hex"); + "-M vexpress-a9 -device loader,file=tests/data/hex-loader/test.hex"); for (i = 0; i < 256; ++i) { uint8_t val = qtest_readb(s, base_addr + i);