diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-02-28 14:28:31 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-02-28 14:28:31 +1100 |
| commit | 061956966eb59f9a3b275f878ca2c9a3f11a9149 (patch) | |
| tree | 617e3c647bb8b7a1d8b1e0c7dd93e44f4db92b96 | |
| parent | 16b1e69127ee8d26002cfe8fc5baccee5dae9d98 (diff) | |
| download | mongo-061956966eb59f9a3b275f878ca2c9a3f11a9149.tar.gz | |
Make checks of test code optional, so they don't complain in a release tree.
| -rw-r--r-- | dist/s_copyright | 10 | ||||
| -rw-r--r-- | dist/s_style | 7 | ||||
| -rw-r--r-- | dist/s_whitespace | 7 |
3 files changed, 12 insertions, 12 deletions
diff --git a/dist/s_copyright b/dist/s_copyright index 1ab73970f87..cec1ee94d05 100644 --- a/dist/s_copyright +++ b/dist/s_copyright @@ -68,7 +68,7 @@ check() echo "$1: copyright information is incorrect" } -l="`cd .. && \ +l=`cd .. && \ echo LICENSE \ COPYING \ examples/c/*.c \ @@ -79,11 +79,9 @@ l="`cd .. && \ lang/python/*pack*.py \ src/include/*.[hi] \ src/include/*.in \ - src/utilities/*.[ch] \ - test/format/*.[ch] \ - test/salvage/*.[ch] \ - test/suite/*.py \ - test/thread/*.[ch]`" + src/utilities/*.[ch] && \ + find test/format test/salvage test/suite test/thread \ + -name '*.[ch]' -o -name '*.py' -print` for i in $l `sed -e '/^[a-z]/! d' filelist`; do check $i diff --git a/dist/s_style b/dist/s_style index dbc63f5fa7b..dba35944fd3 100644 --- a/dist/s_style +++ b/dist/s_style @@ -4,8 +4,9 @@ t=__wt.$$ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 -extra=`cd .. && echo src/include/*.[hi] src/include/*.in test/*/*.[ch] dist/*.py` -( +extra=`cd .. && echo dist/*.py src/include/*.[hi] src/include/*.in && \ + find test -name '*.[ch]' -print` + for f in `sed -e '/^[a-z]/! d' filelist` $extra; do f="../$f" if grep "^[^}]*while (0);" $f > /dev/null; then @@ -55,4 +56,4 @@ for f in `sed -e '/^[a-z]/! d' filelist` $extra; do -e 's/sizeof(WT_PAGE_DISK)/WT_PAGE_DISK_SIZE/g' >$t cmp $t $f > /dev/null 2>&1 || (echo "$f" && cp $t $f) -done) +done diff --git a/dist/s_whitespace b/dist/s_whitespace index 9dec6e6eff1..2e2c2863b4c 100644 --- a/dist/s_whitespace +++ b/dist/s_whitespace @@ -4,12 +4,13 @@ t=__wt.$$ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 -inc=`cd .. && echo src/include/*.[hi] src/include/*.in test/*/*.[ch] dist/*.py dist/s_*` -( +inc=`cd .. && echo dist/*.py dist/s_* src/include/*.[hi] src/include/*.in && + find test -name '*.[ch]' -print` + for f in `sed -e '/^[a-z]/! d' filelist` $inc; do f="../$f" sed -e 's/[ ][ ]*$//' \ -e '/^$/N' \ -e '/\n$/D' < $f > $t cmp $t $f > /dev/null 2>&1 || (echo "$f" && cp $t $f) -done) +done |