From patchwork Thu May 25 19:25:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9749029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0EA6660209 for ; Thu, 25 May 2017 19:27:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2758283BA for ; Thu, 25 May 2017 19:27:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7838283BE; Thu, 25 May 2017 19:27:16 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 8E013283BA for ; Thu, 25 May 2017 19:27:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1036647AbdEYT1P (ORCPT ); Thu, 25 May 2017 15:27:15 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34295 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1036612AbdEYT1E (ORCPT ); Thu, 25 May 2017 15:27:04 -0400 Received: by mail-pf0-f195.google.com with SMTP id w69so41051518pfk.1 for ; Thu, 25 May 2017 12:27:04 -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:in-reply-to:references; bh=4o9tK3szmvU4UplpjLXPxnM1PRXIN/ivpGjSI3XOuZI=; b=vVVzoTPHS+86IyYtDQM7SmJh+c1pU0xwHNper1bflzzXPPow2eh50386pByeM/7L8e qnZqD6ekucv9KkmkMz6Am/zpj08yGF3jVNzsZViPrxXcw2dJaxpGnYu1jheSIGzWNL0T OREfiShmo20Ki4UCnSTod1uFr2KVBVW0xn73rahQX1ivUXvxi/aDzQV+XlLsRRvdbiZk g/MrgxAmc16oMjeEtT/Rpe1vmQesoXtrbCSQzdqFnNs9nKiuCTuq20Eoxz8HOo57CXfb LzwZ6RM1thL5PCVy+Ugia1vSOawAWhV4voU8T7Vc/wb/OS18qQm+g9+U60fZy1bQzFYa 23qw== 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; bh=4o9tK3szmvU4UplpjLXPxnM1PRXIN/ivpGjSI3XOuZI=; b=iL1tesMo+jpbrfpguVPTG5NCIlhy+nRL8vjdLrpCTbEI1bnGoumR7k5Mnp9XarSD6M LpZZUO1xRgI4xmE8dkbvI173PgH7v2fjQ5QiD3/LA2oi8JOAWYsFYb1NspWeZnBZIt6X +hrH3E+RV6x0CI80c3FIJ9G5ZNknmGWsxgru6EtyiwsLdE2U2CCO4/Le7kLIrrUw0rDG kdUbtLyG9j3OBWjIHPxRAY+u1PAYtvcYPX3YH+CI1BoVATzDC+XFxbOcRgyZ1wt78pTP SXTXp0f+3kxDTAA0gqwJdXC/W0P5MVyYV9dGFsH94NPllPS0PLAURWsCSXBFz3V3KzH9 V/sg== X-Gm-Message-State: AODbwcCXSFyOk1Scix6LQZgiwexIykyQZWcWQRF7eJHtMK4dp6tqsQph BuLar4M2F2RDMg== X-Received: by 10.99.120.206 with SMTP id t197mr48431435pgc.64.1495740423837; Thu, 25 May 2017 12:27:03 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id f86sm14617917pfj.128.2017.05.25.12.27.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 12:27:03 -0700 (PDT) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [PATCH 4/7] Makefile: always run get-all Date: Thu, 25 May 2017 12:25:46 -0700 Message-Id: <20170525192549.138518-5-ebiggers3@gmail.com> X-Mailer: git-send-email 2.13.0.219.gdb65acc882-goog In-Reply-To: <20170525192549.138518-1-ebiggers3@gmail.com> References: <20170525192549.138518-1-ebiggers3@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Run get-all as the first step of 'make all'. We were previously running get-all only if required repositories were missing. But we may also need to clone optional repositories or check out different commits in already-cloned repositories. Signed-off-by: Eric Biggers --- Makefile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f5e2245..6be3752 100644 --- a/Makefile +++ b/Makefile @@ -2,29 +2,30 @@ # A simple makefile for xfstests-bld # +REPOS = fio \ + quota \ + stress-ng \ + xfsprogs-dev \ + xfstests-dev + SUBDIRS = acl \ android-compat \ attr \ dbench \ e2fsprogs-libs \ - fio \ - quota \ libaio \ misc \ popt \ - stress-ng \ - xfsprogs-dev \ - xfstests-dev + $(REPOS) SCRIPTS = android-xfstests.sh \ gce-xfstests.sh \ kvm-xfstests.sh -all: xfsprogs-dev xfstests-dev fio quota $(SCRIPTS) - ./build-all -xfsprogs-dev xfstests-dev fio quota: +all: $(SCRIPTS) ./get-all + ./build-all $(SCRIPTS): %.sh: kvm-xfstests/%.in sed -e "s;@DIR@;$$(pwd);" < $< > $@ @@ -43,7 +44,9 @@ kvm-xfstests/util/zerofree: kvm-xfstests/util/zerofree.c cc -static -o $@ $< -lext2fs -lcom_err -lpthread realclean: clean - rm -rf xfsprogs-dev xfstests-dev fio quota *.ver + rm -rf $(REPOS) *.ver tarball: ./gen-tarball + +.PHONY: all clean realclean tarball