From patchwork Tue Jun 18 12:23:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koji Nakamaru via GitGitGadget X-Patchwork-Id: 11001515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDCA676 for ; Tue, 18 Jun 2019 12:24:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE11F28A62 for ; Tue, 18 Jun 2019 12:24:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C288328A6C; Tue, 18 Jun 2019 12:24:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 783F228A62 for ; Tue, 18 Jun 2019 12:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729157AbfFRMYD (ORCPT ); Tue, 18 Jun 2019 08:24:03 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:38287 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726446AbfFRMX7 (ORCPT ); Tue, 18 Jun 2019 08:23:59 -0400 Received: by mail-ed1-f65.google.com with SMTP id r12so19254335edo.5 for ; Tue, 18 Jun 2019 05:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=r5uoQmZO3M+XVfIq4e5gddCzILUfy/PIzJiD/+VBcEo=; b=pm/hV5yarxnvk7kC3CxopxoURCd8+xkCz5tKBqPhV4BJPjE8HOSpiCoBAb0KBKVzv3 7Q2+F3L7udOC4rdnFk3oZme/vy103zJ96wT80jGl9hAQ6yDosxgPd9cPr5fPQIqc2z+B WizDxZCUWeA4+uO/G8BQN5JGa93uLPR7m+zN69j+bnixqkvURJMQW1BJMv8ezZSXbBKQ ZkErOp79VL4CQZbVut2dkh1XIxYLZfTzSJq0JdLDDFgh0CmkW3N05XViT3XQHc5x7KND yCXi41MyuGhk9t/2RVtHl3mfEDNmfAG++dKxPL4g+8xJwtEIhdznZmy25cEyg6BZSYC0 SCUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=r5uoQmZO3M+XVfIq4e5gddCzILUfy/PIzJiD/+VBcEo=; b=lI71/mntDnk0HzLbtzZcv1aeSjmrdOeUKOEImUvJ9YTTDNAckS//p3f1+8wEechQLV ukWJO8WHgp1zTlKlg7Tk2m2hMLS5MAUOSt/OuXTdwqBPVv1UkvNfvOmO91NreHs/IWRY D+rXWlwv00CkCz6xmMokPmNjDy+VKdC9xE66AZmDsuSUmeN0oxJRP5odgA5CqgOE1+WN NNa453MbjsnejUr7LS4SP1U1GhA9V8TDj2ODgDfz67XHeJHsD7GSSBw58dvahQViNMNr NKQfGaSLD5ezHibCqnXFXCBgEWFoXz1wI2q5Ze7EftbYHHH73tRw2XFoUJis4PN0Ia3J Q2ag== X-Gm-Message-State: APjAAAWib62mcnl362Q0cRZNdZSWHcPf3UwMPOep5M8iDsjlxasmn/bQ zTTf9WCcGD9sUF9+j0Bq6aV7k8xc X-Google-Smtp-Source: APXvYqyFEFQ6nfwzu6OD1tRUYDtvNZ91UMQXu/d4sNieyf8dgwNus2x1l3tfgUfiLOBnAcSzlemVBg== X-Received: by 2002:a50:974b:: with SMTP id d11mr88771534edb.24.1560860637679; Tue, 18 Jun 2019 05:23:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y22sm4392960edw.94.2019.06.18.05.23.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jun 2019 05:23:57 -0700 (PDT) Date: Tue, 18 Jun 2019 05:23:57 -0700 (PDT) X-Google-Original-Date: Tue, 18 Jun 2019 12:23:39 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 02/17] t0001 (mingw): do not expect a specific order of stdout/stderr Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin When redirecting stdout/stderr to the same file, we cannot guarantee that stdout will come first. In fact, in this test case, it seems that an MSVC build always prints stderr first. In any case, this test case does not want to verify the *order* but the *presence* of both outputs, so let's relax the test a little. Signed-off-by: Johannes Schindelin --- t/t0001-init.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 77a224aafb..c7ab18f40f 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -474,7 +474,8 @@ test_expect_success MINGW 'redirect std handles' ' GIT_REDIRECT_STDERR="2>&1" \ git rev-parse --git-dir --verify refs/invalid && printf ".git\nfatal: Needed a single revision\n" >expect && - test_cmp expect output.txt + sort output.sorted && + test_cmp expect output.sorted ' test_done