From patchwork Tue Aug 13 04:12:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atharva Lele X-Patchwork-Id: 1146010 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dtrZD4h/"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 466znc1BsQz9sNk for ; Tue, 13 Aug 2019 14:12:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6B13B86BC6; Tue, 13 Aug 2019 04:12:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6LOeidw431+V; Tue, 13 Aug 2019 04:12:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 151F786BA4; Tue, 13 Aug 2019 04:12:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CCCA81BF369 for ; Tue, 13 Aug 2019 04:12:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C92F6204E8 for ; Tue, 13 Aug 2019 04:12:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r8TwleYMN+5T for ; Tue, 13 Aug 2019 04:12:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by silver.osuosl.org (Postfix) with ESMTPS id 4E0C4203E8 for ; Tue, 13 Aug 2019 04:12:13 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id w26so5546714pfq.12 for ; Mon, 12 Aug 2019 21:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZYIyJFlEwSET6BRwnYzhvsxijFhx/hqZ+BDA9Rzvz+4=; b=dtrZD4h/tg/4TUJ+SMri3sPcT4VhbdbPyJbGZ0kaik1yh+jDrla8EAMI6poSO29x2x VYNmGIrSWa4ltANS/NegoeHmEuwPBiDlkWDgW04HNy8n+7PEt4U36DulJ7zUJNDZVUo8 KeL+RABbk16KEaDC4o94JskgHhnc95ApRCQyoBMIpCW0VU0Fmxav7Lvo3HtMnrt2vI74 Fq3gdlkDiT4FOTe58rUZF5HZGSv6CNSXxVVxv2h5yeRyLjBpbJ9cCrSkiAVmmJs67Gsu 1Naq4fbz9xYFpL6rBYwr5OCFVR8TyetmEzom8lGm1+neJWZU+qmZSEpiH03WKodEixGG cfqA== 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=ZYIyJFlEwSET6BRwnYzhvsxijFhx/hqZ+BDA9Rzvz+4=; b=HibOmaVIPKNyuSEJHCy4a8K57lO0NM6eEF6h0wy6Gwb+4aqc34/FXhF3hhI0VRofTH 5+vDgRwwLMB44WSLcTIiljHvUxRvrS5GK5kmc+Wxv8StXEBov5ZcZdCUN+pcL8qQ+H+N 2bPuFitT+raaYmBYAgtRzoRoyfodcEAtjlsBXEVQ0iW+5oI7fm1E8R8XP0SQ+xSmYBFE AYmoXgikaB+pELyqvWBT/eGm5J96ewbzoJwLvyvZQcwGcXgv/op8KyoWpVCfNxVasMau 2xuRzPxh1HdOaoIlbBv8g3jrb4YSbdp5VGVgIzRTA2lSQ4UKu3wHcLmf5IOGIybQuiBo kXDQ== X-Gm-Message-State: APjAAAW6MZRztJmcaqGYV8XkytNrERTS810qX8SYayWx0Qo22JnRRCDu Zop+4GkI3zpyj6N4tRxxMZAmMEOfU0M= X-Google-Smtp-Source: APXvYqw61farMWiftFBIPKN8KyoB6RwXsU5XFwzSKoKZ1/JH67ZmwkVJ3p8FBvNoXAtc7th0T8HH/w== X-Received: by 2002:aa7:9293:: with SMTP id j19mr19521630pfa.90.1565669532467; Mon, 12 Aug 2019 21:12:12 -0700 (PDT) Received: from localhost.localdomain ([123.201.52.15]) by smtp.gmail.com with ESMTPSA id s5sm91946132pfm.97.2019.08.12.21.12.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 21:12:11 -0700 (PDT) From: Atharva Lele To: buildroot@buildroot.org Date: Tue, 13 Aug 2019 09:42:04 +0530 Message-Id: <20190813041206.20715-1-itsatharva@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/3] autobuild-run: maintain consistency in diffoscope command X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atharva Lele , yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since we are outputting to two file types, we can't just redirect stdout. Instead, we use diffoscope's ability to output to a file to maintain consistency in the command. This patch also fixes a typo in the command. For text output, it should be reproducibility_results_txt instead of reproducibility_results_text. Signed-off-by: Atharva Lele --- scripts/autobuild-run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index dbb497c..ead81a0 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -454,9 +454,9 @@ class Builder: prefix = prefix[13:-1] log_write(self.log, "INFO: running diffoscope on images") subprocess.call(["diffoscope", build_1_image, build_2_image, - "--tool-prefix-binutils", prefix, "--json", "-", - "--text", reproducible_results_text, "--max-text-report-size", "40000"], - stdout=diff, stderr=self.log) + "--tool-prefix-binutils", prefix, "--json", reproducible_results, + "--text", reproducible_results_txt, "--max-text-report-size", "40000"], + stderr=self.log) else: log_write(self.log, "INFO: diffoscope not installed, falling back to cmp") subprocess.call(["cmp", "-b", build_1_image, build_2_image], stdout=diff, stderr=self.log)