From patchwork Wed Jan 15 14:46:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wainer dos Santos Moschetta X-Patchwork-Id: 11335015 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 982C813A0 for ; Wed, 15 Jan 2020 14:46:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D563222C3 for ; Wed, 15 Jan 2020 14:46:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="N/J/DzVO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726574AbgAOOqS (ORCPT ); Wed, 15 Jan 2020 09:46:18 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24136 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726248AbgAOOqS (ORCPT ); Wed, 15 Jan 2020 09:46:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579099577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OCzZCRpCPvMJOJFp80Kyy/tm7e/FK8QUZeBwS6jnLQU=; b=N/J/DzVOOCkbnNjYK7cEFUkUb2N8G5R4y91wybVf4y3z+M4+zEXpiYaWXO2UvuyA3J2BOF ZFimoSqL9Ma/cmItvWvrraT/+cgCEWd4Ir1bF2+LRhnW1/Lec8aCsu62vkV2F7mQ85BSwE TMtaggWU+TQSspx/f9YJv38jzFZmcy4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-xrmhWreLPce99JAUX81nnA-1; Wed, 15 Jan 2020 09:46:15 -0500 X-MC-Unique: xrmhWreLPce99JAUX81nnA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 089BB1902ED3 for ; Wed, 15 Jan 2020 14:46:15 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-74.gru2.redhat.com [10.97.116.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDEDF89E61; Wed, 15 Jan 2020 14:46:11 +0000 (UTC) From: Wainer dos Santos Moschetta To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, thuth@redhat.com Subject: [PATCH v3] travis.yml: Prevent 'script' from premature exit Date: Wed, 15 Jan 2020 11:46:10 -0300 Message-Id: <20200115144610.41655-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The 'script' section finishes its execution prematurely whenever a shell's exit is called. If the intention is to force Travis to flag a build/test failure then the correct approach is erroring any command statement. In this change, it combines the grep's in a single AND statement that in case of false Travis will interpret as a build error. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Thomas Huth --- Changes v2 to v3: - Do not grep for SKIP, it needs at least one PASS [thuth] Changes v1 to v2: - Simplify the grep's in a single statement [thuth] - Also grep for SKIP (besides PASS) [myself] .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 091d071..f0cfc82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,5 +119,4 @@ before_script: script: - make -j3 - ACCEL="${ACCEL:-tcg}" ./run_tests.sh -v $TESTS | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi - - if ! grep -q PASS results.txt ; then exit 1 ; fi + - grep -q PASS results.txt && ! grep -q FAIL results.txt