From 5d37670e8507563db556879041c7992936aefa56 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 9 May 2012 14:19:03 -0600 Subject: [PATCH] LU-1347 build: remove the vim/emacs modelines Remove the expandtabs directive from vim modelines from test scripts and autoconf files as well. In some cases where a very large test script has been using 4-space indents for a long time, add directives for 4-space tabstops so that the formatting is not too ugly. Signed-off-by: Andreas Dilger Change-Id: I115abb1ceea5744495bc189bc5a83e734b845d36 Reviewed-on: http://review.whamcloud.com/2698 Tested-by: Hudson Reviewed-by: Li Wei Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre-iokit/mds-survey/mds-survey | 3 ++- lustre/autoconf/lustre-core.m4 | 2 -- lustre/tests/conf-sanity.sh | 2 -- lustre/tests/functions.sh | 2 ++ lustre/tests/ha.sh | 3 ++- lustre/tests/krb5_login.sh | 2 -- lustre/tests/large-scale.sh | 2 ++ lustre/tests/lfsck.sh | 2 ++ lustre/tests/lnet-selftest.sh | 2 ++ lustre/tests/lustre-rsync-test.sh | 2 ++ lustre/tests/mmp.sh | 3 ++- lustre/tests/ost-pools.sh | 2 +- lustre/tests/recovery-double-scale.sh | 2 +- lustre/tests/recovery-mds-scale.sh | 2 +- lustre/tests/recovery-random-scale.sh | 2 +- lustre/tests/replay-dual.sh | 3 +++ lustre/tests/replay-ost-single.sh | 2 ++ lustre/tests/replay-vbr.sh | 2 ++ lustre/tests/sanity-gss.sh | 2 +- lustre/tests/sanity.sh | 2 -- lustre/tests/setup-nfs.sh | 1 - lustre/tests/setup_kerberos.sh | 3 ++- lustre/tests/test-framework.sh | 3 ++- lustre/tests/yaml.sh | 2 +- lustre/utils/gss/nfs-utils-1.0.10-lustre.diff | 18 +++++------------- 25 files changed, 38 insertions(+), 33 deletions(-) diff --git a/lustre-iokit/mds-survey/mds-survey b/lustre-iokit/mds-survey/mds-survey index e4d20c3..19536f2 100755 --- a/lustre-iokit/mds-survey/mds-survey +++ b/lustre-iokit/mds-survey/mds-survey @@ -1,5 +1,6 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: ###################################################################### # customize per survey diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 31b0fd6..1deef60 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1,5 +1,3 @@ -#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -#* vim:expandtab:shiftwidth=8:tabstop=8: # # LC_CONFIG_SRCDIR # diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index d937c31..b3e2667 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1,6 +1,4 @@ #!/bin/bash -# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- -# vim:autoindent:shiftwidth=4:tabstop=4: # FIXME - there is no reason to use all of these different # return codes, espcially when most of them are mapped to something diff --git a/lustre/tests/functions.sh b/lustre/tests/functions.sh index 912fc9b..b176b7b 100644 --- a/lustre/tests/functions.sh +++ b/lustre/tests/functions.sh @@ -1,4 +1,6 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # Simple function used by run_*.sh scripts diff --git a/lustre/tests/ha.sh b/lustre/tests/ha.sh index 78ee3d7..1c36fd9 100755 --- a/lustre/tests/ha.sh +++ b/lustre/tests/ha.sh @@ -1,5 +1,6 @@ #!/bin/bash -# vim: expandtab tabstop=4 softtabstop=4 shiftwidth=4 textwidth=80 +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # NAME # diff --git a/lustre/tests/krb5_login.sh b/lustre/tests/krb5_login.sh index 31ad933..da09190 100755 --- a/lustre/tests/krb5_login.sh +++ b/lustre/tests/krb5_login.sh @@ -1,6 +1,4 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: - # # krb5_login.sh - obtain and cache Kerberos ticket-granting ticket # diff --git a/lustre/tests/large-scale.sh b/lustre/tests/large-scale.sh index 571f1ec..6792612 100644 --- a/lustre/tests/large-scale.sh +++ b/lustre/tests/large-scale.sh @@ -1,4 +1,6 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: set -e diff --git a/lustre/tests/lfsck.sh b/lustre/tests/lfsck.sh index 669054a..2c58f5f 100644 --- a/lustre/tests/lfsck.sh +++ b/lustre/tests/lfsck.sh @@ -1,4 +1,6 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # test e2fsck and lfsck to detect and fix filesystem corruption # diff --git a/lustre/tests/lnet-selftest.sh b/lustre/tests/lnet-selftest.sh index 860aa92..f42ed4f 100755 --- a/lustre/tests/lnet-selftest.sh +++ b/lustre/tests/lnet-selftest.sh @@ -1,4 +1,6 @@ #!/bin/sh +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)} . $LUSTRE/tests/test-framework.sh diff --git a/lustre/tests/lustre-rsync-test.sh b/lustre/tests/lustre-rsync-test.sh index 1cfeaff..e09985e 100644 --- a/lustre/tests/lustre-rsync-test.sh +++ b/lustre/tests/lustre-rsync-test.sh @@ -1,4 +1,6 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # Run select tests by setting ONLY, or as arguments to the script. # Skip specific tests by setting EXCEPT. diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh index 074a20c..b99b4b6 100755 --- a/lustre/tests/mmp.sh +++ b/lustre/tests/mmp.sh @@ -1,5 +1,6 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # Tests for multiple mount protection (MMP) feature. # diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh index bdb0e09..bb0e6a2 100644 --- a/lustre/tests/ost-pools.sh +++ b/lustre/tests/ost-pools.sh @@ -1,6 +1,6 @@ #!/bin/bash # -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- -# vim:autoindent:shiftwidth=4:tabstop=4: +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # Run select tests by setting ONLY, or as arguments to the script. # Skip specific tests by setting EXCEPT. diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh index 18ca852..92ebdff 100644 --- a/lustre/tests/recovery-double-scale.sh +++ b/lustre/tests/recovery-double-scale.sh @@ -1,5 +1,5 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # All pairwise combinations of node failures. # Was cmd3-17 diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh index 6a914b3..ba3b5e6 100644 --- a/lustre/tests/recovery-mds-scale.sh +++ b/lustre/tests/recovery-mds-scale.sh @@ -1,5 +1,5 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # Was Test 11 in cmd3. # For duration of 24 hours repeatedly failover a random MDS at diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh index 9de55c0..bc2e70d 100644 --- a/lustre/tests/recovery-random-scale.sh +++ b/lustre/tests/recovery-random-scale.sh @@ -1,5 +1,5 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # client failure does not affect other clients diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index 2ac97fc..72b8346 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -1,4 +1,7 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: + set -e # bug number: 10124 diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index 46e4f02..0f4194b 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -1,4 +1,6 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: set -e diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh index e25ffee..0ebf389 100644 --- a/lustre/tests/replay-vbr.sh +++ b/lustre/tests/replay-vbr.sh @@ -1,4 +1,6 @@ #!/bin/bash +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: set -e diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh index b3062ed..0c5c624 100644 --- a/lustre/tests/sanity-gss.sh +++ b/lustre/tests/sanity-gss.sh @@ -1,5 +1,5 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # Run select tests by setting ONLY, or as arguments to the script. # Skip specific tests by setting EXCEPT. diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 9bf66a9..c9bbf5a 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1,6 +1,4 @@ #!/bin/bash -# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- -# vim:autoindent:shiftwidth=4:tabstop=4: # # Run select tests by setting ONLY, or as arguments to the script. # Skip specific tests by setting EXCEPT. diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh index 97c8c31..7863d40 100755 --- a/lustre/tests/setup-nfs.sh +++ b/lustre/tests/setup-nfs.sh @@ -1,5 +1,4 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: #set -x EXPORT_OPTS=${EXPORT_OPTS:-"rw,async,no_root_squash"} diff --git a/lustre/tests/setup_kerberos.sh b/lustre/tests/setup_kerberos.sh index d7e53a0..b6f9b89 100755 --- a/lustre/tests/setup_kerberos.sh +++ b/lustre/tests/setup_kerberos.sh @@ -1,5 +1,6 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # setup_kerberos.sh - setup the Kerberos environment on Lustre cluster diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 980a587..843fe41 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1,5 +1,6 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*- +# vim:shiftwidth=4:softtabstop=4:tabstop=4: trap 'print_summary && touch $TF_FAIL && \ echo "test-framework exiting on error"' ERR diff --git a/lustre/tests/yaml.sh b/lustre/tests/yaml.sh index 13f69bf..e3d9c8f 100644 --- a/lustre/tests/yaml.sh +++ b/lustre/tests/yaml.sh @@ -1,5 +1,5 @@ #!/bin/bash -# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4: +# vim:shiftwidth=4:softtabstop=4:tabstop=4: # # Shell routines for logging results to a yaml file. diff --git a/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff b/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff index 58f21fe..5f95668 100644 --- a/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff +++ b/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff @@ -2341,10 +2341,8 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/krb5_util.h nfs-utils-1.0.10.lustre/utils diff -rNup nfs-utils-1.0.10/utils/gssd/lgss_keyring.c nfs-utils-1.0.10.lustre/utils/gssd/lgss_keyring.c --- nfs-utils-1.0.10/utils/gssd/lgss_keyring.c 1969-12-31 17:00:00.000000000 -0700 +++ nfs-utils-1.0.10.lustre/utils/gssd/lgss_keyring.c 2007-05-15 13:01:35.000000000 -0600 -@@ -0,0 +1,778 @@ -+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -+ * vim:expandtab:shiftwidth=8:tabstop=8: -+ * +@@ -0,0 +1,776 @@ ++/* + * lucall_keyring.c + * user-space upcall to create GSS context, using keyring interface to kernel + * @@ -3164,10 +3162,8 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/l_idmap.c nfs-utils-1.0.10.lustre/utils/g diff -rNup nfs-utils-1.0.10/utils/gssd/lsupport.c nfs-utils-1.0.10.lustre/utils/gssd/lsupport.c --- nfs-utils-1.0.10/utils/gssd/lsupport.c 1969-12-31 17:00:00.000000000 -0700 +++ nfs-utils-1.0.10.lustre/utils/gssd/lsupport.c 2007-05-15 13:01:35.000000000 -0600 -@@ -0,0 +1,783 @@ -+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -+ * vim:expandtab:shiftwidth=8:tabstop=8: -+ * +@@ -0,0 +1,781 @@ ++/* + * Copyright (c) 2005 Cluster File Systems, Inc. + * + * This file is part of Lustre, http://www.lustre.org. @@ -3951,11 +3947,7 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/lsupport.c nfs-utils-1.0.10.lustre/utils/ diff -rNup nfs-utils-1.0.10/utils/gssd/lsupport.h nfs-utils-1.0.10.lustre/utils/gssd/lsupport.h --- nfs-utils-1.0.10/utils/gssd/lsupport.h 1969-12-31 17:00:00.000000000 -0700 +++ nfs-utils-1.0.10.lustre/utils/gssd/lsupport.h 2007-05-15 13:01:35.000000000 -0600 -@@ -0,0 +1,89 @@ -+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -+ * vim:expandtab:shiftwidth=8:tabstop=8: -+ */ -+ +@@ -0,0 +1,85 @@ +#ifndef __LIBCFS_H__ +#define __LIBCFS_H__ + -- 1.8.3.1