Merge branch 'master' of github.com:google/grpc into node_surface_cancellation

pull/221/head
murgatroid99 10 years ago
commit 12958f9f25
  1. 9
      tools/clang-format/clang-format-all.sh
  2. 11
      tools/clang-format/config.sh
  3. 2
      tools/run_tests/run_tests.py

@ -1,9 +0,0 @@
#!/bin/bash
set -e
source $(dirname $0)/config.sh
cd $(dirname $0)/../..
for dir in src test include
do
find $dir -name '*.c' -or -name '*.cc' -or -name '*.h' | xargs $CLANG_FORMAT -i
done

@ -1,11 +0,0 @@
CLANG_FORMAT=clang-format-3.5
set -ex
if not hash $CLANG_FORMAT 2>/dev/null; then
echo "$CLANG_FORMAT is needed but not installed"
echo "perhaps try:"
echo " sudo apt-get install $CLANG_FORMAT"
exit 1
fi

@ -204,7 +204,7 @@ class TestCache(object):
def _build_and_run(check_cancelled, newline_on_success, cache):
"""Do one pass of building & running tests."""
# build latest, sharing cpu between the various makes
# build latest sequentially
if not jobset.run(build_steps, maxjobs=1):
return 1

Loading…
Cancel
Save