From 3d601fe32066619f50297cb52131d1bbf5e6862e Mon Sep 17 00:00:00 2001 From: iphydf Date: Wed, 6 May 2020 00:15:09 +0100 Subject: style: Run restyled on Travis and Circle CI scripts. --- .circleci/cmake-asan | 30 +++++++++++++-------------- .circleci/cmake-tsan | 30 +++++++++++++-------------- .travis/autotools-linux | 22 +++++++++++--------- .travis/cmake-freebsd-env.sh | 13 ++++++------ .travis/cmake-freebsd-stage1 | 47 ++++++++++++++++++++++--------------------- .travis/cmake-freebsd-stage2 | 4 ++-- .travis/cmake-osx | 10 ++++----- .travis/cmake-win32 | 2 +- .travis/cmake-win64 | 2 +- .travis/cmake-windows.sh | 16 +++++++-------- .travis/flags-clang.sh | 2 +- .travis/flags-gcc.sh | 2 +- .travis/flags.sh | 17 +++++++++------- .travis/tox-bootstrapd-docker | 20 +++++++++--------- .travis/upload-coverage | 8 ++++---- 15 files changed, 116 insertions(+), 109 deletions(-) diff --git a/.circleci/cmake-asan b/.circleci/cmake-asan index cc1434b1..deabfa39 100755 --- a/.circleci/cmake-asan +++ b/.circleci/cmake-asan @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -eu @@ -9,23 +9,23 @@ add_flag -Werror add_flag -fdiagnostics-color=always add_flag -fno-omit-frame-pointer add_flag -fsanitize=address,undefined -cmake -B_build -H. -GNinja \ - -DCMAKE_C_FLAGS="$C_FLAGS" \ - -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ - -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ - -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ - -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ - -DMIN_LOGGER_LEVEL=TRACE \ - -DMUST_BUILD_TOXAV=ON \ - -DNON_HERMETIC_TESTS=ON \ - -DSTRICT_ABI=ON \ - -DTEST_TIMEOUT_SECONDS=120 \ - -DUSE_IPV6=OFF \ +cmake -B_build -H. -GNinja \ + -DCMAKE_C_FLAGS="$C_FLAGS" \ + -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ + -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ + -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ + -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ + -DMIN_LOGGER_LEVEL=TRACE \ + -DMUST_BUILD_TOXAV=ON \ + -DNON_HERMETIC_TESTS=ON \ + -DSTRICT_ABI=ON \ + -DTEST_TIMEOUT_SECONDS=120 \ + -DUSE_IPV6=OFF \ -DAUTOTEST=ON cd _build -ninja install -j$(nproc) +ninja install -j"$(nproc)" export ASAN_OPTIONS="detect_invalid_pointer_pairs=1" export ASAN_OPTIONS="$ASAN_OPTIONS,detect_stack_use_after_return=1" @@ -33,4 +33,4 @@ export ASAN_OPTIONS="$ASAN_OPTIONS,strict_init_order=1" export ASAN_OPTIONS="$ASAN_OPTIONS,strict_string_checks=1" export ASAN_OPTIONS="$ASAN_OPTIONS,symbolize=1" ctest -j50 --output-on-failure || -ctest -j50 --output-on-failure --rerun-failed + ctest -j50 --output-on-failure --rerun-failed diff --git a/.circleci/cmake-tsan b/.circleci/cmake-tsan index b42e8f18..b55597b9 100755 --- a/.circleci/cmake-tsan +++ b/.circleci/cmake-tsan @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -eu @@ -9,26 +9,26 @@ add_flag -Werror add_flag -fdiagnostics-color=always add_flag -fno-omit-frame-pointer add_flag -fsanitize=thread -cmake -B_build -H. -GNinja \ - -DCMAKE_C_FLAGS="$C_FLAGS" \ - -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ - -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ - -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ - -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ - -DMIN_LOGGER_LEVEL=TRACE \ - -DMUST_BUILD_TOXAV=ON \ - -DNON_HERMETIC_TESTS=ON \ - -DSTRICT_ABI=ON \ - -DTEST_TIMEOUT_SECONDS=120 \ - -DUSE_IPV6=OFF \ +cmake -B_build -H. -GNinja \ + -DCMAKE_C_FLAGS="$C_FLAGS" \ + -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ + -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \ + -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \ + -DCMAKE_INSTALL_PREFIX:PATH="$PWD/_install" \ + -DMIN_LOGGER_LEVEL=TRACE \ + -DMUST_BUILD_TOXAV=ON \ + -DNON_HERMETIC_TESTS=ON \ + -DSTRICT_ABI=ON \ + -DTEST_TIMEOUT_SECONDS=120 \ + -DUSE_IPV6=OFF \ -DAUTOTEST=ON cd _build -ninja install -j$(nproc) +ninja install -j"$(nproc)" export TSAN_OPTIONS="halt_on_error=1" export TSAN_OPTIONS="$TSAN_OPTIONS,second_deadlock_stack=1" export TSAN_OPTIONS="$TSAN_OPTIONS,symbolize=1" ctest -j50 --output-on-failure || -ctest -j50 --output-on-failure --rerun-failed + ctest -j50 --output-on-failure --rerun-failed diff --git a/.travis/autotools-linux b/.travis/autotools-linux index 96c110ab..ffadcad8 100755 --- a/.travis/autotools-linux +++ b/.travis/autotools-linux @@ -1,22 +1,24 @@ -#!/bin/sh +#!/bin/bash ACTION="$1" set -eu CACHEDIR="$HOME/cache" -NPROC=`nproc` +NPROC=$(nproc) travis_install() { # Install vanilla NaCl only. [ -f "$CACHEDIR/lib/amd64/libnacl.a" ] || { curl https://hyperelliptic.org/nacl/nacl-20110221.tar.bz2 | tar jx - cd nacl-20110221 # pushd + cd nacl-20110221 # pushd "./do" # "make install" - mkdir -p "$CACHEDIR/include"; mv build/*/include/* "$CACHEDIR/include" - mkdir -p "$CACHEDIR/lib" ; mv build/*/lib/* "$CACHEDIR/lib" - cd - # popd + mkdir -p "$CACHEDIR/include" + mv build/*/include/* "$CACHEDIR/include" + mkdir -p "$CACHEDIR/lib" + mv build/*/lib/* "$CACHEDIR/lib" + cd - # popd } } @@ -38,11 +40,11 @@ travis_script() { autoreconf -fi mkdir -p _build - cd _build # pushd - ../configure $CONFIG_FLAGS || (cat config.log && false) + cd _build # pushd + ../configure "${CONFIG_FLAGS[@]}" || (cat config.log && false) make "-j$NPROC" -k CFLAGS="$C_FLAGS" LDFLAGS="$LD_FLAGS" - make -j50 -k distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIG_FLAGS" || (cat tox-*/_build/build/test-suite.log && false) - cd - # popd + make -j50 -k distcheck DISTCHECK_CONFIGURE_FLAGS="${CONFIG_FLAGS[*]}" || (cat tox-*/_build/build/test-suite.log && false) + cd - # popd } if [ "-z" "$ACTION" ]; then diff --git a/.travis/cmake-freebsd-env.sh b/.travis/cmake-freebsd-env.sh index 7d698940..96bf2d49 100644 --- a/.travis/cmake-freebsd-env.sh +++ b/.travis/cmake-freebsd-env.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Common variables and functions @@ -8,19 +8,19 @@ SCREEN_SESSION=freebsd SSH_PORT=10022 FREEBSD_VERSION="12.1" -IMAGE_NAME=FreeBSD-${FREEBSD_VERSION}-RELEASE-amd64.raw +IMAGE_NAME=FreeBSD-$FREEBSD_VERSION-RELEASE-amd64.raw # https://download.freebsd.org/ftp/releases/VM-IMAGES/12.1-RELEASE/amd64/Latest/ IMAGE_SHA512="a65da6260f5f894fc86fbe1f27dad7800906da7cffaa5077f82682ab74b6dd46c4ce87158c14b726d74ca3c6d611bea3bb336164da3f1cb990550310b110da22" RUN() { - ssh -t -o ConnectionAttempts=120 -o ConnectTimeout=2 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost -p $SSH_PORT "$@" + ssh -t -o ConnectionAttempts=120 -o ConnectTimeout=2 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost -p "$SSH_PORT" "$@" } start_vm() { - screen -d -m qemu-system-x86_64 -curses -m 2048 -smp $NPROC -net user,hostfwd=tcp::${SSH_PORT}-:22 -net nic "$IMAGE_NAME" + screen -d -m qemu-system-x86_64 -curses -m 2048 -smp "$NPROC" -net user,hostfwd=tcp::"$SSH_PORT"-:22 -net nic "$IMAGE_NAME" # Wait for ssh to start listening on the port - while ! echo "exit" | nc localhost ${SSH_PORT} | grep 'OpenSSH'; do + while ! echo "exit" | nc localhost "$SSH_PORT" | grep 'OpenSSH'; do sleep 5 done @@ -29,8 +29,7 @@ start_vm() { RUN last } -stop_vm() -{ +stop_vm() { # Turn it off # We use this contraption because for some reason `shutdown -h now` and # `poweroff` result in FreeBSD not shutting down on Travis (they work on my diff --git a/.travis/cmake-freebsd-stage1 b/.travis/cmake-freebsd-stage1 index 6a88ed44..29667e82 100755 --- a/.travis/cmake-freebsd-stage1 +++ b/.travis/cmake-freebsd-stage1 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Download and initial setup of the FreeBSD VM @@ -9,7 +9,7 @@ set -eux . .travis/cmake-freebsd-env.sh travis_install() { - git tag -l --sort=version:refname > GIT_TAGS + git tag -l --sort=version:refname >GIT_TAGS OLD_PWD="$PWD" @@ -19,9 +19,9 @@ travis_install() { # === Get the VM image, set it up and cache === # Create image if it's not cached, or if this build script has changed, or a new toxcore tag was pushed - sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh" > /tmp/sha - sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1" >> /tmp/sha - sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >> /tmp/sha + sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh" >/tmp/sha + sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1" >>/tmp/sha + sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >>/tmp/sha if [ ! -f "./$IMAGE_NAME.tgz" ] || [ ! -f ./cmake-freebsd-stage1-all.sha256 ] || [ "$(cat cmake-freebsd-stage1-all.sha256)" != "$(cat /tmp/sha)" ] || ! diff -u ./GIT_TAGS "$OLD_PWD/GIT_TAGS"; then rm -rf ./* @@ -42,8 +42,8 @@ travis_install() { DL_MIRROR_11=14 # There are 11 mirrors - DL_MIRROR_RANDOM=`expr $(date +%s) % 11 + 1` - DL_URL="ftp://ftp$(eval echo \$DL_MIRROR_$DL_MIRROR_RANDOM).us.freebsd.org/pub/FreeBSD/releases/VM-IMAGES/${FREEBSD_VERSION}-RELEASE/amd64/Latest/${IMAGE_NAME}.xz" + DL_MIRROR_RANDOM=$(expr "$(date +%s)" % 11 + 1) + DL_URL="ftp://ftp$(eval echo \$DL_MIRROR_"$DL_MIRROR_RANDOM").us.freebsd.org/pub/FreeBSD/releases/VM-IMAGES/$FREEBSD_VERSION-RELEASE/amd64/Latest/$IMAGE_NAME.xz" # Make sure there are no partial downloads from the previous loop iterations rm -rf ./* @@ -51,7 +51,7 @@ travis_install() { wget --tries 1 "$DL_URL" && break done - if ! ( echo "$IMAGE_SHA512 $IMAGE_NAME.xz" | sha512sum -c --status - ) ; then + if ! (echo "$IMAGE_SHA512 $IMAGE_NAME.xz" | sha512sum -c --status -); then echo "Error: sha512 of $IMAGE_NAME.xz doesn't match the known one" exit 1 fi @@ -81,18 +81,19 @@ travis_install() { RUN chsh -s /usr/local/bin/bash root # Install required toxcore dependencies - RUN PAGER=cat ASSUME_ALWAYS_YES=YES pkg install git \ - opus \ - libconfig \ - libvpx \ - libsodium \ - gmake \ - cmake \ - pkgconf \ - portaudio \ - libsndfile \ - texinfo \ - autotools + RUN PAGER=cat ASSUME_ALWAYS_YES=YES pkg install \ + git \ + opus \ + libconfig \ + libvpx \ + libsodium \ + gmake \ + cmake \ + pkgconf \ + portaudio \ + libsndfile \ + texinfo \ + autotools # === Cache the VM image === @@ -103,9 +104,9 @@ travis_install() { rm "$IMAGE_NAME" cp "$OLD_PWD/GIT_TAGS" . - sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh" > cmake-freebsd-stage1-all.sha256 - sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1" >> cmake-freebsd-stage1-all.sha256 - sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >> cmake-freebsd-stage1-all.sha256 + sha256sum "$OLD_PWD/.travis/cmake-freebsd-env.sh" >cmake-freebsd-stage1-all.sha256 + sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1" >>cmake-freebsd-stage1-all.sha256 + sha256sum "$OLD_PWD/.travis/cmake-freebsd-stage1.expect" >>cmake-freebsd-stage1-all.sha256 ls -lh fi diff --git a/.travis/cmake-freebsd-stage2 b/.travis/cmake-freebsd-stage2 index 98090ba1..6db74542 100755 --- a/.travis/cmake-freebsd-stage2 +++ b/.travis/cmake-freebsd-stage2 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Toxcore building @@ -35,7 +35,7 @@ travis_install() { cd "$OLD_PWD" # Copy over toxcore code from Travis to qemu - scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P $SSH_PORT -r ./* root@localhost:~ + scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P "$SSH_PORT" -r ./* root@localhost:~ RUN ls -lh } diff --git a/.travis/cmake-osx b/.travis/cmake-osx index cb12301d..b6ee8430 100755 --- a/.travis/cmake-osx +++ b/.travis/cmake-osx @@ -1,11 +1,11 @@ -#!/bin/sh +#!/bin/bash ACTION="$1" set -eu CACHEDIR="$HOME/cache" -NPROC=`sysctl -n hw.physicalcpu` +NPROC=$(sysctl -n hw.physicalcpu) travis_install() { # Workaround for bug in Homebrew where it only finds an old Ruby version. @@ -35,11 +35,11 @@ travis_script() { -DUSE_IPV6=OFF \ -DAUTOTEST=ON - cd _build # pushd + cd _build # pushd make "-j$NPROC" -k install - make "-j$NPROC" test ARGS="-j50" || \ + make "-j$NPROC" test ARGS="-j50" || make "-j$NPROC" test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1 - cd - # popd + cd - # popd } if [ "-z" "$ACTION" ]; then diff --git a/.travis/cmake-win32 b/.travis/cmake-win32 index e4be36f0..eea88d05 100755 --- a/.travis/cmake-win32 +++ b/.travis/cmake-win32 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash i686=true x86_64=false diff --git a/.travis/cmake-win64 b/.travis/cmake-win64 index f961a00b..2b71df90 100755 --- a/.travis/cmake-win64 +++ b/.travis/cmake-win64 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash i686=false x86_64=true diff --git a/.travis/cmake-windows.sh b/.travis/cmake-windows.sh index 85d47e1b..69114471 100644 --- a/.travis/cmake-windows.sh +++ b/.travis/cmake-windows.sh @@ -1,20 +1,20 @@ -#!/bin/sh +#!/bin/bash ACTION="$1" set -eu CACHEDIR="$HOME/cache" -NPROC=`nproc` +NPROC=$(nproc) travis_install() { cd other/docker/windows docker build \ - --build-arg SUPPORT_ARCH_i686=$i686 \ - --build-arg SUPPORT_ARCH_x86_64=$x86_64 \ + --build-arg SUPPORT_ARCH_i686="$i686" \ + --build-arg SUPPORT_ARCH_x86_64="$x86_64" \ --build-arg SUPPORT_TEST=true \ - -t toxcore-$WINDOWS_ARCH \ + -t toxcore-"$WINDOWS_ARCH" \ . } @@ -27,8 +27,8 @@ travis_script() { docker run \ -e ALLOW_TEST_FAILURE=true \ - -e ENABLE_ARCH_i686=$i686 \ - -e ENABLE_ARCH_x86_64=$x86_64 \ + -e ENABLE_ARCH_i686="$i686" \ + -e ENABLE_ARCH_x86_64="$x86_64" \ -e ENABLE_TEST=true \ -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \ -e CMAKE_C_FLAGS="$C_FLAGS" \ @@ -38,7 +38,7 @@ travis_script() { -v "$PWD:/toxcore" \ -v "$PWD/result:/prefix" \ --rm \ - toxcore-$WINDOWS_ARCH + toxcore-"$WINDOWS_ARCH" } if [ "-z" "$ACTION" ]; then diff --git a/.travis/flags-clang.sh b/.travis/flags-clang.sh index 1bca35ca..f505698e 100644 --- a/.travis/flags-clang.sh +++ b/.travis/flags-clang.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . .travis/flags.sh diff --git a/.travis/flags-gcc.sh b/.travis/flags-gcc.sh index 0d262060..eefc7c26 100644 --- a/.travis/flags-gcc.sh +++ b/.travis/flags-gcc.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . .travis/flags.sh diff --git a/.travis/flags.sh b/.travis/flags.sh index a617ec8e..30284d38 100644 --- a/.travis/flags.sh +++ b/.travis/flags.sh @@ -1,10 +1,13 @@ -#!/bin/sh +#!/bin/bash -add_config_flag() { CONFIG_FLAGS="$CONFIG_FLAGS $@"; } -add_c_flag() { C_FLAGS="$C_FLAGS $@"; } -add_cxx_flag() { CXX_FLAGS="$CXX_FLAGS $@"; } -add_ld_flag() { LD_FLAGS="$LD_FLAGS $@"; } -add_flag() { add_c_flag "$@"; add_cxx_flag "$@"; } +add_config_flag() { CONFIG_FLAGS+=("$@"); } +add_c_flag() { C_FLAGS="$C_FLAGS $@"; } +add_cxx_flag() { CXX_FLAGS="$CXX_FLAGS $@"; } +add_ld_flag() { LD_FLAGS="$LD_FLAGS $@"; } +add_flag() { + add_c_flag "$@" + add_cxx_flag "$@" +} export LD_LIBRARY_PATH="$CACHEDIR/lib" export PKG_CONFIG_PATH="$CACHEDIR/lib/pkgconfig" @@ -13,7 +16,7 @@ export PKG_CONFIG_PATH="$CACHEDIR/lib/pkgconfig" # and friends here (we unset them below), because they influence config tests # such as ./configure and cmake tests. Our warning flags break those tests, so # we can't add them globally here. -CONFIG_FLAGS="" +CONFIG_FLAGS=() C_FLAGS="" CXX_FLAGS="" LD_FLAGS="" diff --git a/.travis/tox-bootstrapd-docker b/.travis/tox-bootstrapd-docker index bd192f07..e370118d 100755 --- a/.travis/tox-bootstrapd-docker +++ b/.travis/tox-bootstrapd-docker @@ -1,8 +1,10 @@ -#!/bin/sh +#!/bin/bash set -exu -tar c $(git ls-files) | docker build -f other/bootstrap_daemon/docker/Dockerfile -t toxchat/bootstrap-node - +readarray -t FILES <<<"$(git ls-files)" + +tar c "${FILES[@]}" | docker build -f other/bootstrap_daemon/docker/Dockerfile -t toxchat/bootstrap-node - sudo useradd \ --home-dir /var/lib/tox-bootstrapd \ --create-home \ @@ -29,12 +31,12 @@ fi COUNTER=0 COUNTER_END=120 -while [ $COUNTER -lt $COUNTER_END ]; do - if docker logs tox-bootstrapd | grep -q "Connected to another bootstrap node successfully" ; then +while [ "$COUNTER" -lt "$COUNTER_END" ]; do + if docker logs tox-bootstrapd | grep -q "Connected to another bootstrap node successfully"; then break fi sleep 1 - COUNTER=$(($COUNTER+1)) + COUNTER=$(($COUNTER + 1)) done docker logs tox-bootstrapd @@ -49,18 +51,18 @@ sleep 30 docker ps -a -if [ "`docker inspect -f {{.State.Running}} tox-bootstrapd`" != "true" ]; then +if [ "$(docker inspect -f {{.State.Running}} tox-bootstrapd)" != "true" ]; then echo "Error: Container is not running" exit 1 fi -cat /proc/$(pidof tox-bootstrapd)/limits -if ! cat /proc/$(pidof tox-bootstrapd)/limits | grep -P '^Max open files(\s+)32768(\s+)32768(\s+)files'; then +cat /proc/"$(pidof tox-bootstrapd)"/limits +if ! grep -P '^Max open files(\s+)32768(\s+)32768(\s+)files' /proc/"$(pidof tox-bootstrapd)"/limits; then echo "Error: ulimit is not set to the expected value" exit 1 fi -if ! other/fun/bootstrap_node_info.py ipv4 localhost 33445 ; then +if ! other/fun/bootstrap_node_info.py ipv4 localhost 33445; then echo "Error: Unable to get bootstrap node info" exit 1 fi diff --git a/.travis/upload-coverage b/.travis/upload-coverage index 08f0e482..d49538d9 100755 --- a/.travis/upload-coverage +++ b/.travis/upload-coverage @@ -1,10 +1,10 @@ #!/bin/bash # We only submit coverage from the Linux build. -coveralls \ - --exclude auto_tests \ - --exclude other \ - --exclude testing \ +coveralls \ + --exclude auto_tests \ + --exclude other \ + --exclude testing \ --gcov-options '\-lp' bash <(curl -s https://codecov.io/bash) -- cgit v1.2.3