# HG changeset patch # User Mads Kiilerich # Date 2012-04-22 23:56:48 # Node ID c326fe884daa0bbf8ddc09c0f02787d22801c258 # Parent abbabbbe4ec2e0d95f6b02cf6c303e970b927b11 tests: avoid tab indent on all kinds of lines of sh commands diff --git a/contrib/check-code.py b/contrib/check-code.py --- a/contrib/check-code.py +++ b/contrib/check-code.py @@ -76,6 +76,7 @@ testpats = [ (r'if\s*!', "don't use '!' to negate exit status"), (r'/dev/u?random', "don't use entropy, use /dev/zero"), (r'do\s*true;\s*done', "don't use true as loop body, use sleep 0"), + (r'^( *)\t', "don't use tabs to indent"), ], # warnings [] @@ -87,7 +88,6 @@ testfilters = [ ] uprefix = r"^ \$ " -uprefixc = r"^ > " utestpats = [ [ (r'^(\S| $ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"), @@ -98,7 +98,6 @@ utestpats = [ "explicit exit code checks unnecessary"), (uprefix + r'set -e', "don't use set -e"), (uprefix + r'\s', "don't indent commands, use > for continued lines"), - (uprefixc + r'( *)\t', "don't use tabs to indent"), ], # warnings [] diff --git a/tests/test-convert-p4-filetypes b/tests/test-convert-p4-filetypes --- a/tests/test-convert-p4-filetypes +++ b/tests/test-convert-p4-filetypes @@ -44,7 +44,7 @@ for T in $TYPES ; do T2=`echo $T | tr [:upper:] [:lower:]` case $T in apple) - ;; + ;; symlink*) echo "this is target $T" >target_$T2 ln -s target_$T file_$T2 @@ -52,7 +52,7 @@ for T in $TYPES ; do p4 add -t $T file_$T2 ;; binary*) - python -c "file('file_$T2', 'wb').write('this is $T')" + python -c "file('file_$T2', 'wb').write('this is $T')" p4 add -t $T file_$T2 ;; *)