From patchwork Mon Mar 25 13:20:08 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: 161108 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3974148jan; Mon, 25 Mar 2019 06:30:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvc0Utm9fMrJsxydUhuYTWbYjhuz+WhpcW7Gvbr1ROJxTIV50/G4K2NLPDP3jMRubcU63G X-Received: by 2002:a0d:dc83:: with SMTP id f125mr21678247ywe.67.1553520616804; Mon, 25 Mar 2019 06:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520616; cv=none; d=google.com; s=arc-20160816; b=CvXKOzdkHVk3mmOS/DDRtLY8ew5oAlezK6daP5nboChqCDYnzQRTMPHetOROaNhg3x /2nqL+PNaPrX8qvJLfItNAihRQlzSuiBbpUbxp4CrempWuyGG5bf6EL0cWEnqj6AuvZ/ asOvyL9z+GkFu1p37OEh3xkTCQDs8sRquTg++ZP78Hb/Ze8/Kq9iWymSyBbUksfheHDn JCbjWZCwWXtdenx7HV9xnji6ntNUgJ6Fbig3vxmNPwzLQpzEA3cq8fHDhjgxGTfrTmgf Rr9VWJuWrdUMBsgKde0BOZNUw50z7XBYj/Hl74sCA4cDTUriEeFU0vleCts9qa4znABL 38Ug== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=WboWrZHDwiX6QlMUuwtLgKLN5Cc+bEmImarIIYLXzjI=; b=krRqQh3qjHGwSssau/cvn2cpryiKSw9jnzrQ2xoOoYSlPIXCXzw8Oqq4aDZ5IkwTav YFiLeyNbzbtYwk0ORempz8bPLO+05qoifInJ+y2vl9hrOhr+5koCgf2AGjGWT2OBYa6/ BmVJ0HGnynhT3hcANk+e6jhCf61jG69S2jiOh4RdsicwUMUuye48VyzJiexyKzFWzPvN dTTZDhJuI5wPQ9oZKhsaVK+NkPjTWLDaFzPNALn0cpbuXCDY9lZQjKcobex9pxf9V7H8 Ca+I8E1QsumnEs518V9BUBJ3NnTMjRSffnKNBhO33OBpse4RxtNE00YxhBO3SwppCcoS /Pqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LYRnyqjg; 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 p144si9289952ywp.222.2019.03.25.06.30.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:30:16 -0700 (PDT) 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=LYRnyqjg; 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 ([127.0.0.1]:42613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Pg8-0003yu-96 for patch@linaro.org; Mon, 25 Mar 2019 09:30:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWf-0004IQ-Cr for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWb-0005Az-Is for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:27 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWX-00054n-OX for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:23 -0400 Received: by mail-wm1-x342.google.com with SMTP id a184so8884631wma.2 for ; Mon, 25 Mar 2019 06:20:18 -0700 (PDT) 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=WboWrZHDwiX6QlMUuwtLgKLN5Cc+bEmImarIIYLXzjI=; b=LYRnyqjgUl5De+bOe8hyFGPgvU1XyE2y3SpIvdNKt+LUKo+XPsFuGKou4K+0JgH+HC WfP8hdVYTveBcs3wUlAKGhnhiWOB88JYix0dutvMmhC9FPQGsYdOFztOjGa5y5oJDayL NFrnmeSnbfg9MsJGRCWg6EYrzExqWRvpJHB4MQw7NV6im376RQvHBXsSjOj4dELEpJFd 9KwkphFLy+PJxQ5wjFQF1c1K8gbVuCYTH9ldb6Ysi6GHz5gfKU31X0UAEn5ecsUSFZuT 0L4A5YEMzf78JGcokmAqbAs60y0MYgD9f2fu8l0jDPls+GDRoT47kwo/C8xc3BykWgrA 70mg== 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=WboWrZHDwiX6QlMUuwtLgKLN5Cc+bEmImarIIYLXzjI=; b=eI1/Vjm/o6WNLai71tZzmIHgJ5tn0fcn1CqQWiDCjkQR6ppr+qw5xVhcR5UqeJJ2Ry szNXBnoHZlegYrhsnnSF+zsLP90kN11xGN/XBGOUraAacCFoAZPQ1bJ1HHDchP7lGSgK 229fe0qWQZheb9YMqJ0NZkBxGy+e64rF6NXNq6nxeQ5R9NzI10VD9kyJ4OH0XHP4nRuA OdQDeqfmBoMka0h1owuZ1Pzn+NBajJa9PfIloatdmTu8O4e0RidNki0Chaf/yi5P3E5/ JfG+G43bcr3H76pGD13yOfU2eMoRBiCRw6DYxsiCwJlaVz8WiTvAOPdocZhouhSY5T7Z Cjzw== X-Gm-Message-State: APjAAAViqsx6VHub+KIq3PkvetzTV+LdfeZaIR1T8i7k10LhjvWEKwTf nxy5p82Ky8lDwudIJdFFkM2cWcbqXdE= X-Received: by 2002:a7b:c086:: with SMTP id r6mr5226257wmh.123.1553520017072; Mon, 25 Mar 2019 06:20:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 93sm36735384wrh.15.2019.03.25.06.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:15 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 072121FF98; Mon, 25 Mar 2019 13:20:10 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:08 +0000 Message-Id: <20190325132009.14987-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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::342 Subject: [Qemu-devel] [PULL 8/9] docker: Fix travis script unable to find source dir X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta The script generated from QEMU_SRC/.travis.yml uses BUILD_DIR and SRC_DIR path relative to the current dir, unless these variables are exported in environment. Since commit 05790dafef1 BUILD_DIR is exported in the runner script, although SRC_DIR is not, so that make docker-travis fails becase the reference to source dir is wrong. So let's unset both BUILD_DIR and SRC_DIR before calling the script, given it is executed from the source dir already (as in Travis). Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190320221207.11366-3-wainersm@redhat.com> Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/travis b/tests/docker/travis index d345393ced..47c03677d6 100755 --- a/tests/docker/travis +++ b/tests/docker/travis @@ -18,4 +18,5 @@ cmdfile=/tmp/travis_cmd_list.sh $QEMU_SRC/tests/docker/travis.py $QEMU_SRC/.travis.yml > $cmdfile chmod +x $cmdfile cd "$QEMU_SRC" +unset BUILD_DIR SRC_DIR $cmdfile