From patchwork Mon Jul 10 21:29:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Buchbinder X-Patchwork-Id: 9833811 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 BDC9F602A0 for ; Mon, 10 Jul 2017 21:29:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABEB128487 for ; Mon, 10 Jul 2017 21:29:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A074A284C7; Mon, 10 Jul 2017 21:29:30 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, 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 452EB28487 for ; Mon, 10 Jul 2017 21:29:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754756AbdGJV31 (ORCPT ); Mon, 10 Jul 2017 17:29:27 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:35967 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754630AbdGJV3Z (ORCPT ); Mon, 10 Jul 2017 17:29:25 -0400 Received: by mail-pg0-f53.google.com with SMTP id u62so55539657pgb.3 for ; Mon, 10 Jul 2017 14:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CLsO07Af8DsmgCdVvBwGW1d08gZxLSOljHqdS0UorRI=; b=hgKyn20F7CajGD4XUNKsfiEGyH65UmvSgHZzY7X4vwqwptv+gPEJQjlOkdb/JVggMK Ce5n7AutbNAc+YCeh9AoqVmKwUbDstDd/E5C7byoe+wAGwhyPb4bfTDTIzz+oYRDa1Kh Q24hpF9sb1rkhT5vai2azOcvWBP4NCABXOmMLVDINqAYxq6BRo+goyLtzcXU37FbTq8t eeZjWIAxKgwajp3568W2Yw1cZgVRqXoG78ndXYSBDZlXXJ7KLOG98AMyxeL3U1+ZpnAd dXpuZpOWKnwNb5SpB1RfHvLbyOqAgICD5pvqsGKW5KrtoRsZVfvMb90ypjDv37q/VfLz NHiw== 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; bh=CLsO07Af8DsmgCdVvBwGW1d08gZxLSOljHqdS0UorRI=; b=GuqDt+kA2xkjFR5nvxTQhvgGcjdvJsu2SHh7S8RRMU/SxT1P7oa3F8ZXX7lL1bAOSl xnGRsSY3/nNrHOkfbD+uEMWuXGdD1yxrLFFOcaHpvFWtfwt1XRj0XcW8u5cHtsr72S17 cLEW/m+YFyiVulK8Pv9R431lafQYb/iq73B8evZex72Gl5gfJX/nGG4e9FMXpWaEjx/e M894W6tOa62Za8y3t3b1iacG2C8FVxKejMXC6K4U+W6kezxxnwpqpF9fwn0S+r1wye7v V3LNGuMbUv5a/mDlqwqgOb6zJrrLrIcSnatRH4mvtcui30xLmRXOPOoMdT2lX5/xvjTY VbdQ== X-Gm-Message-State: AIVw113ijWgnaYYhrfGyi9LQPZLOBwb7QaNeBmoqLG1GBCGBU7Lw+sCh 6g+6FTzH3Sz/eh+ZdjLUeQ== X-Received: by 10.99.51.1 with SMTP id z1mr16934718pgz.227.1499722164156; Mon, 10 Jul 2017 14:29:24 -0700 (PDT) Received: from abuchbinder-glaptop.corp.google.com ([100.123.105.175]) by smtp.gmail.com with ESMTPSA id j27sm23712148pgn.63.2017.07.10.14.29.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jul 2017 14:29:23 -0700 (PDT) From: Adam Buchbinder To: linux-btrfs@vger.kernel.org Cc: abuchbinder@google.com Subject: [PATCH] btrfs-progs: Fix missing internal deps in tests. Date: Mon, 10 Jul 2017 14:29:08 -0700 Message-Id: <20170710212909.31559-1-abuchbinder@google.com> X-Mailer: git-send-email 2.13.2.725.g09c95d1e9-goog Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Doing a straight 'make test' would fail because some misc and fsck tests require particular tools to already be built. Add dependencies at the Makefile and shell-script level. Signed-off-by: Adam Buchbinder --- Makefile | 5 +++-- tests/fsck-tests.sh | 1 + tests/misc-tests.sh | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81598df..4669525 100644 --- a/Makefile +++ b/Makefile @@ -272,11 +272,12 @@ test-convert: btrfs btrfs-convert $(Q)bash tests/convert-tests.sh test-check: test-fsck -test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs +test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune @echo " [TEST] fsck-tests.sh" $(Q)bash tests/fsck-tests.sh -test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum +test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum \ + btrfs-zero-log btrfs-find-root btrfs-select-super @echo " [TEST] misc-tests.sh" $(Q)bash tests/misc-tests.sh diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh index 44cca1b..15d26c7 100755 --- a/tests/fsck-tests.sh +++ b/tests/fsck-tests.sh @@ -23,6 +23,7 @@ rm -f "$RESULTS" check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfs +check_prereq btrfstune check_kernel_support run_one_test() { diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh index 1c645c9..0898801 100755 --- a/tests/misc-tests.sh +++ b/tests/misc-tests.sh @@ -24,6 +24,9 @@ check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfstune check_prereq btrfs +check_prereq btrfs-zero-log +check_prereq btrfs-find-root +check_prereq btrfs-select-super check_kernel_support # The tests are driven by their custom script called 'test.sh'