From patchwork Sat Aug 26 05:19:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Dilger X-Patchwork-Id: 806081 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xfRDT0GFwz9t3G for ; Sat, 26 Aug 2017 15:19:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252AbdHZFTu (ORCPT ); Sat, 26 Aug 2017 01:19:50 -0400 Received: from smtp-out-so.shaw.ca ([64.59.136.139]:49791 "EHLO smtp-out-so.shaw.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750737AbdHZFTu (ORCPT ); Sat, 26 Aug 2017 01:19:50 -0400 Received: from cabot.adilger.int ([70.77.216.213]) by shaw.ca with SMTP id lTVcdJGrADJTWlTVddw25d; Fri, 25 Aug 2017 23:19:50 -0600 X-Authority-Analysis: v=2.2 cv=B4DJ6KlM c=1 sm=1 tr=0 a=BQvS1EmAg2ttxjPVUuc1UQ==:117 a=BQvS1EmAg2ttxjPVUuc1UQ==:17 a=RPJ6JBhKAAAA:8 a=zypLxLTwrPPDz5WjyTUA:9 a=fa_un-3J20JGBB2Tu-mn:22 From: Andreas Dilger To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, Andreas Dilger Subject: [PATCH] tests: report if a test is taking a long time Date: Fri, 25 Aug 2017 23:19:48 -0600 Message-Id: <1503724788-84776-1-git-send-email-adilger@dilger.ca> X-Mailer: git-send-email 1.8.0 X-CMAE-Envelope: MS4wfAGW1Kq83QMSzAdP5o6FJs4LuSj2blBXLP8FrVKAp3Kl2vlAvhKuLOHlivv4jYFKc6qm4CRfjUbw+wZnLsew1Q6DKDG12xS3vl1ImO/dEwsX9netVBmt wqaeFIKA4oGQc7uolkfgYhDYtnAoKLu2mvqOwDmnNpexeMaWIVO71VkE7UH1/HZMzSb2YMzDxQugYG3nCnWKsFMniXXF6JldbKNgyFiOLcIxtSMoPsiegQKn Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Print out a message if a test takes longer than 60s, with a reminder to potentially add is_slow_test to that test, so that it is easier to find which tests are taking a long time, especially if running with "make -j check" or similar. Add an exclusion for r_expand_full on MacOS since HFS+ does not support sparse devices and doesn't like large test images. Signed-off-by: Andreas Dilger --- tests/r_expand_full/script | 6 ++++++ tests/test_one.in | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tests/r_expand_full/script b/tests/r_expand_full/script index a2c09db..2fd4461 100644 --- a/tests/r_expand_full/script +++ b/tests/r_expand_full/script @@ -23,6 +23,12 @@ cat > $CONF << ENDL } ENDL +if [ $(uname -s) = "Darwin" ]; then + # creates a 786MB filesystem + echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)" + return 0 +fi + echo "resize2fs test" > $OUT MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 786432 >> $OUT 2>&1 diff --git a/tests/test_one.in b/tests/test_one.in index 35465b6..d046380 100644 --- a/tests/test_one.in +++ b/tests/test_one.in @@ -61,6 +61,7 @@ fi rm -f $test_name.ok $test_name.failed #echo -e -n "$test_name: $test_description:\r" +start=$SECONDS if [ -f $test_dir/script ]; then . $test_dir/script else @@ -72,6 +73,11 @@ else echo "$test_name: Missing test script $default_script!" fi fi +elapsed=$((SECONDS - start)) +if [ $elapsed -gt 60 -a ! -f $test_dir/is_slow_test ]; then + echo "$test_name: *** took $elapsed seconds to finish ***" + echo "$test_name: consider adding $test_dir/is_slow_test" +fi if [ "$SKIP_UNLINK" != "true" ] ; then rm -f $TMPFILE