June 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/1944'
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit bc50f082bd3a84156dd12db9e2186fd083b216c1 Merge: 2eae59e47 3adabaf3e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 10:48:14 2020 -0400 Merge branch 'tor-github/pr/1944' changes/ticket40006 | 6 ++++++ src/lib/tls/buffers_tls.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[chutney/master] copy CODE_OF_CONDUCT file from Tor.
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 0ae59827635059350ddf5ca712f967b85b9d7f8b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 10:28:40 2020 -0400 copy CODE_OF_CONDUCT file from Tor. --- CODE_OF_CONDUCT | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT new file mode 100644 index 0000000..d8d160a --- /dev/null +++ b/CODE_OF_CONDUCT @@ -0,0 +1,7 @@ +The Tor Project is committed to fostering a inclusive community +where people feel safe to engage, share their points of view, and +participate. For the latest version of our Code of Conduct, please +see + +https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt +

1 0

[chutney/master] whoops: add missing template for bridge-obfs4.
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 894132c084a60e13afd910899ed20163af3ef6a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 10:26:36 2020 -0400 whoops: add missing template for bridge-obfs4. --- torrc_templates/bridge-obfs4.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/torrc_templates/bridge-obfs4.tmpl b/torrc_templates/bridge-obfs4.tmpl new file mode 100644 index 0000000..e9b40bf --- /dev/null +++ b/torrc_templates/bridge-obfs4.tmpl @@ -0,0 +1,6 @@ +${include:bridge.tmpl} + +ServerTransportPlugin obfs4 exec ${path:obfs4proxy} +ExtOrPort $extorport +ServerTransportListenAddr obfs4 ${ip}:${ptport} +

1 0

[chutney/master] Fix errors from -o nounset
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit ddabffb369bf06103cc46cee87e1c9dac8b52c66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 10:23:55 2020 -0400 Fix errors from -o nounset --- tools/bootstrap-network.sh | 10 ++++++++++ tools/test-network.sh | 15 ++++++++++++--- tools/warnings.sh | 9 +++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index d253455..005e0b4 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -15,6 +15,16 @@ set -o errexit set -o nounset +# Set some default values if the variables are not already set +: ${CHUTNEY_WARNINGS_ONLY:=false} +: ${CHUTNEY_WARNINGS_SKIP:=false} +: ${CHUTNEY_DIAGNOSTICS_ONLY:=false} +: ${NETWORK_DRY_RUN:=false} +: ${USE_COVERAGE_BINARY:=false} +: ${CHUTNEY_DIAGNOSTICS:=false} +: ${CHUTNEY_DATA_DIR:=} + + # Get a working chutney path if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then # looks like a broken path: use the path to this tool instead diff --git a/tools/test-network.sh b/tools/test-network.sh index 91baa09..633798b 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -29,10 +29,19 @@ export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} # Linux, which is the only tor platform with a supported sandbox. #export CHUTNEY_TOR_SANDBOX=1 +# Set some default values if the variables are not already set +: ${CHUTNEY_WARNINGS_ONLY:=false} +: ${CHUTNEY_WARNINGS_SKIP:=false} +: ${CHUTNEY_DIAGNOSTICS_ONLY:=false} +: ${NETWORK_DRY_RUN:=false} +: ${USE_COVERAGE_BINARY:=false} +: ${CHUTNEY_DIAGNOSTICS:=false} +: ${CHUTNEY_DATA_DIR:=} + # what we say when we fail UPDATE_YOUR_CHUTNEY="Please update your chutney using 'git pull'." -until [ -z "$1" ] +until [ -z "${1:-}" ] do case "$1" in # the path to the chutney directory @@ -237,8 +246,8 @@ fi # $CHUTNEY_TOR and $CHUTNEY_TOR_GENCERT, or $PATH # # Find the Tor build dir using the src/tools dir -if [ ! -d "$TOR_DIR" ]; then - if [ -d "$BUILDDIR/src/tools" ]; then +if [ ! -d "${TOR_DIR:-}" ]; then + if [ -d "${BUILDDIR:-}/src/tools" ]; then # Choose the build directory # But only if it looks like one $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" diff --git a/tools/warnings.sh b/tools/warnings.sh index 577c543..7793b28 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -28,6 +28,15 @@ set -o errexit set -o nounset +# Set some default values if the variables are not already set +: ${CHUTNEY_WARNINGS_ONLY:=false} +: ${CHUTNEY_WARNINGS_SKIP:=false} +: ${CHUTNEY_DIAGNOSTICS_ONLY:=false} +: ${NETWORK_DRY_RUN:=false} +: ${USE_COVERAGE_BINARY:=false} +: ${CHUTNEY_DIAGNOSTICS:=false} +: ${CHUTNEY_DATA_DIR:=} + if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then exit 0 fi

1 0

[tor/master] Merge branch 'tor-github/pr/1939'
by asn＠torproject.org 24 Jun '20

24 Jun '20

commit 2eae59e475168c3056cd33d6ead4f384be915ec7 Merge: 279225acd 1bd0494f8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 24 17:22:53 2020 +0300 Merge branch 'tor-github/pr/1939' changes/ticket34232 | 5 +++++ src/core/or/versions.c | 8 ++++---- src/test/test_protover.c | 4 ---- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/master] Make summarize_protover_flags() handle NULL and empty string the same
by asn＠torproject.org 24 Jun '20

24 Jun '20

commit 1bd0494f8c3375c1b6698bf4e6d4d8be324ba934 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Jun 17 11:50:27 2020 -0700 Make summarize_protover_flags() handle NULL and empty string the same --- changes/ticket34232 | 5 +++++ src/core/or/versions.c | 8 ++++---- src/test/test_protover.c | 4 ---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/changes/ticket34232 b/changes/ticket34232 new file mode 100644 index 000000000..2e0046542 --- /dev/null +++ b/changes/ticket34232 @@ -0,0 +1,5 @@ + o Minor bugfixes (string handling): + - In summarize_protover_flags(), treat empty strings the same as NULL. + This prevents protocols_known from being set. Previously, we treated + empty strings as normal strings, which led to protocols_known being + set. Fixes bug 34232; bugfix on 0.3.3.2-alpha. Patch by Neel Chauhan. diff --git a/src/core/or/versions.c b/src/core/or/versions.c index 2f8cbac0e..5dfe0c2cc 100644 --- a/src/core/or/versions.c +++ b/src/core/or/versions.c @@ -490,8 +490,8 @@ memoize_protover_summary(protover_summary_flags_t *out, /** Summarize the protocols listed in protocols into out, * falling back or correcting them based on version as appropriate. * - * If protocols and version are both NULL, returns a summary with no flags - * set. + * If protocols and version are both NULL or "", returns a summary with no + * flags set. * * If the protover string does not contain any recognised protocols, and the * version is not recognised, sets protocols_known, but does not set any other @@ -504,10 +504,10 @@ summarize_protover_flags(protover_summary_flags_t *out, { tor_assert(out); memset(out, 0, sizeof(*out)); - if (protocols) { + if (protocols && strcmp(protocols, "")) { memoize_protover_summary(out, protocols); } - if (version && !strcmpstart(version, "Tor ")) { + if (version && strcmp(version, "") && !strcmpstart(version, "Tor ")) { if (!out->protocols_known) { /* The version is a "Tor" version, and where there is no * list of protocol versions that we should be looking at instead. */ diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 9210ed411..088027481 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -789,13 +789,9 @@ test_protover_summarize_flags(void *args) DEBUG_PROTOVER(flags); tt_mem_op(&flags, OP_EQ, &zero_flags, sizeof(flags)); - /* "" sets the protocols_known flag */ memset(&flags, 0, sizeof(flags)); summarize_protover_flags(&flags, "", ""); DEBUG_PROTOVER(flags); - tt_int_op(flags.protocols_known, OP_EQ, 1); - /* Now clear that flag, and check the rest are zero */ - flags.protocols_known = 0; tt_mem_op(&flags, OP_EQ, &zero_flags, sizeof(flags)); /* Now check version exceptions */

1 0

[tor/master] Improve our clang-format.sh script
by asn＠torproject.org 24 Jun '20

24 Jun '20

commit f3c82c86f9db6b5166aab40ef2ceee4da1e17508 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 11 10:22:42 2020 -0400 Improve our clang-format.sh script Previously, this script ran over every C file in our source code, which took up to a minute on my desktop. Instead, the script now has several modes that it can run in, to minimize the time spent and improve useful output. It should now be suitable for everyday use and git hooks. I hope. I've also renamed this script, so that we can keep using it in the future if we were to move to some tool other than clang-format. --- scripts/maint/clang-format.sh | 41 -------- scripts/maint/code-format.sh | 232 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 41 deletions(-) diff --git a/scripts/maint/clang-format.sh b/scripts/maint/clang-format.sh deleted file mode 100755 index 59832117b..000000000 --- a/scripts/maint/clang-format.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# Copyright 2020, The Tor Project, Inc. -# See LICENSE for licensing information. - -# -# DO NOT COMMIT OR MERGE CODE THAT IS RUN THROUGH THIS TOOL YET. -# -# WE ARE STILL DISCUSSING OUR DESIRED STYLE AND ITERATING ON IT. -# (12 Feb 2020) -# - -# This script runs "clang-format" and "codetool" in sequence over each of -# our source files, and replaces the original file only if it has changed. -# -# We can't just use clang-format -i, since we also want to use codetool to -# reformat a few things back to how we want them, and we want avoid changing -# the mtime on files that didn't actually change. - -set -e - -cd "$(dirname "$0")/../../src/" - -# Shellcheck complains that a for loop over find's output is unreliable, -# since there might be special characters in the output. But we happen -# to know that none of our C files have special characters or spaces in -# their names, so this is safe. -# -# shellcheck disable=SC2044 -for fname in $(find lib core feature app test tools -name '[^.]*.[ch]'); do - tmpfname="${fname}.clang_fmt.tmp" - rm -f "${tmpfname}" - clang-format --style=file "${fname}" > "${tmpfname}" - ../scripts/maint/codetool.py "${tmpfname}" - if cmp "${fname}" "${tmpfname}" >/dev/null 2>&1; then - echo "No change in ${fname}" - rm -f "${tmpfname}" - else - echo "Change in ${fname}" - mv "${tmpfname}" "${fname}" - fi -done diff --git a/scripts/maint/code-format.sh b/scripts/maint/code-format.sh new file mode 100755 index 000000000..d8f597d70 --- /dev/null +++ b/scripts/maint/code-format.sh @@ -0,0 +1,232 @@ +#!/usr/bin/env bash +# Copyright 2020, The Tor Project, Inc. +# See LICENSE for licensing information. + +# +# DO NOT COMMIT OR MERGE CODE THAT IS RUN THROUGH THIS TOOL YET. +# +# WE ARE STILL DISCUSSING OUR DESIRED STYLE AND ITERATING ON IT. +# (12 Feb 2020) +# + +# This script runs "clang-format" and "codetool" in sequence over each of its +# arguments. It either replaces the original, or says whether anything has +# changed, depending on its arguments. +# +# We can't just use clang-format directly, since we also want to use codetool +# to reformat a few things back to how we want them, and we want avoid changing +# the mtime on files that didn't actually change. +# +# Use "-i" to edit the file in-place. +# Use "-c" to exit with a nonzero exit status if any file needs to change. +# Use "-d" to emit diffs. +# +# The "-a" option tells us to run over every Tor source file. +# The "-v" option tells us to be verbose. + +set -e + +ALL=0 +GITDIFF=0 +GITIDX=0 +DIFFMODE=0 +CHECKMODE=0 +CHANGEMODE=0 + +SCRIPT_NAME=$(basename "$0") +SCRIPT_DIR=$(dirname "$0") +SRC_DIR="${SCRIPT_DIR}/../../src" + +function usage() { + echo "$SCRIPT_NAME [-h] [-c|-d|-i] [-v] [-a|-G|files...]" + echo + echo " flags:" + echo " -h: show this help text" + echo " -c: check whether files are correctly formatted" + echo " -d: print a diff for the changes that would be applied" + echo " -i: change files in-place" + echo " -a: run over all the C files in Tor" + echo " -v: verbose mode" + echo " -g: look at the files that have changed in git." + echo " -G: look at the files that are staged for the git commit." + echo + echo "EXAMPLES" + echo + echo " $SCRIPT_NAME -a -i" + echo " rewrite every file in place, whether it has changed or not." + echo " $SCRIPT_NAME -a -d" + echo " as above, but only display the changes." + echo " $SCRIPT_NAME -g -i" + echo " update every file that you have changed in the git working tree." + echo " $SCRIPT_NAME -G -c" + echo " exit with an error if any staged changes are not well-formatted." +} + +FILEARGS_OK=1 + +while getopts "acdgGhiv" opt; do + case "$opt" in + h) usage + exit 0 + ;; + a) ALL=1 + FILEARGS_OK=0 + ;; + g) GITDIFF=1 + FILEARGS_OK=0 + ;; + G) GITIDX=1 + FILEARGS_OK=0 + ;; + c) CHECKMODE=1 + ;; + d) DIFFMODE=1 + ;; + i) CHANGEMODE=1 + ;; + v) VERBOSE=1 + ;; + *) echo + usage + exit 1 + ;; + esac +done +# get rid of the flags; keep the filenames. +shift $((OPTIND - 1)) + +# Define a verbose function. +if [[ $VERBOSE = 1 ]]; then + function note() + { + echo "$@" + } +else + function note() + { + true + } +fi + +# We have to be in at least one mode, or we can't do anything +if [[ $CHECKMODE = 0 && $DIFFMODE = 0 && $CHANGEMODE = 0 ]]; then + echo "Nothing to do. You need to specify -c, -d, or -i." + echo "Try $SCRIPT_NAME -h for more information." + exit 0 +fi + +# We don't want to "give an error if anything would change" if we're +# actually trying to change things. +if [[ $CHECKMODE = 1 && $CHANGEMODE = 1 ]]; then + echo "It doesn't make sense to use -c and -i together." + exit 0 +fi +# It doesn't make sense to look at "all files" and "git files" +if [[ $((ALL + GITIDX + GITDIFF)) -gt 1 ]]; then + echo "It doesn't make sense to use more than one of -a, -g, or -G together." + exit 0 +fi + +if [[ $FILEARGS_OK = 1 ]]; then + # The filenames are on the command-line. + INPUTS=("${@}") +else + if [[ "$#" != 0 ]]; then + echo "Can't use -a, -g, or -G with additional command-line arguments." + exit 1 + fi +fi + +if [[ $ALL = 1 ]]; then + # We're in "all" mode -- use find(1) to find the filenames. + mapfile -d '' INPUTS < <(find "${SRC_DIR}"/{lib,core,feature,app,test,tools} -name '[^.]*.[ch]' -print0) +elif [[ $GITIDX = 1 ]]; then + # We're in "git index" mode -- use git diff --cached to find the filenames + # that are changing in the index, then strip out the ones that + # aren't C. + mapfile INPUTS < <(git diff --name-only --cached --diff-filter=AMCR | grep '\.[ch]$') +elif [[ $GITDIFF = 1 ]]; then + # We are in 'git diff' mode -- we want everything that changed, including + # the index and the working tree. + # + # TODO: There might be a better way to do this. + mapfile INPUTS < <(git diff --name-only --cached --diff-filter=AMCR | grep '\.[ch]$'; git diff --name-only --diff-filter=AMCR | grep '\.[ch]$' ) +fi + +if [[ $GITIDX = 1 ]]; then + # If we're running in git mode, we need to stash all the changes that + # we don't want to look at. This is necessary even though we're only + # looking at the changed files, since we might have the file only + # partially staged. + note "Stashing unstaged changes" + git stash -q --keep-index + function restoregit() { + note "Restoring git state" + git stash pop -q + } +else + function restoregit() { + true + } +fi + +ANY_CHANGED=0 + +tmpfname="" + +# +# Set up a trap handler to make sure that on exit, we remove our +# tmpfile and un-stash the git environment (if appropriate) +# +trap 'if [ -n "${tmpfname}" ]; then rm -f "${tmpfname}"; fi; restoregit' 0 + +for fname in "${INPUTS[@]}"; do + note "Inspecting $fname..." + tmpfname="${fname}.$$.clang_fmt.tmp" + rm -f "${tmpfname}" + clang-format --style=file "${fname}" > "${tmpfname}" + "${SCRIPT_DIR}/codetool.py" "${tmpfname}" + + changed=not_set + + if [[ $DIFFMODE = 1 ]]; then + # If we're running diff for its output, we can also use it + # to compare the files. + if diff -u "${fname}" "${tmpfname}"; then + changed=0 + else + changed=1 + fi + else + # We aren't running diff, so we have to compare the files with cmp. + if cmp "${fname}" "${tmpfname}" >/dev/null 2>&1; then + changed=0 + else + changed=1 + fi + fi + + if [[ $changed = 1 ]]; then + note "Found a change in $fname" + ANY_CHANGED=1 + + if [[ $CHANGEMODE = 1 ]]; then + mv "${tmpfname}" "${fname}" + fi + fi + + rm -f "${tmpfname}" +done + +exitcode=0 + +if [[ $CHECKMODE = 1 ]]; then + if [[ $ANY_CHANGED = 1 ]]; then + note "Found at least one misformatted file; check failed" + exitcode=1 + else + note "No changes found." + fi +fi + +exit $exitcode

1 0

[tor/master] Merge branch 'tor-github/pr/1929'
by asn＠torproject.org 24 Jun '20

24 Jun '20

commit 279225acdd997f0c2ad227fc8b1e5d5c50801dea Merge: 2d9196054 f3c82c86f Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 24 17:20:25 2020 +0300 Merge branch 'tor-github/pr/1929' scripts/maint/clang-format.sh | 41 -------- scripts/maint/code-format.sh | 232 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 41 deletions(-)

1 0

[chutney/master] Use /bin/sh for git pre-commit hook
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit e437e069f76c5e4c1804516cb9753d329fd0eea9 Author: c <c(a)chroniko.jp> Date: Wed Jun 24 02:50:37 2020 +0000 Use /bin/sh for git pre-commit hook There were no bash-specific features in this file, so eliminate dependency on bash and use regular sh. Shellcheck tests pass with the #!/bin/sh shebang. --- scripts/git/pre-commit.git-hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 885df80..1369d9f 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # To install this script, copy it to .git/hooks/pre-commit in local copy of # the chutney git repo, and make sure it has permission to execute.

1 0

[chutney/master] Add `set -o errexit -o nounset` to shell scripts
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 1ebed39da12c302739b827ffb03627d7e36f9f12 Author: c <c(a)chroniko.jp> Date: Wed Jun 24 02:48:50 2020 +0000 Add `set -o errexit -o nounset` to shell scripts For #33604 --- scripts/git/pre-commit.git-hook | 3 ++- tests/shellcheck-tests.sh | 4 ++-- tests/unit-tests.sh | 4 ++-- tools/bootstrap-network.sh | 3 +++ tools/diagnostics.sh | 3 +++ tools/hsaddress.sh | 3 +++ tools/test-network-impl.sh | 3 +++ tools/test-network.sh | 3 +++ tools/warnings.sh | 3 +++ 9 files changed, 24 insertions(+), 5 deletions(-) diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 9aa89d2..885df80 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -10,7 +10,8 @@ workdir=$(git rev-parse --show-toplevel) cd "$workdir" || exit 1 -set -e +set -o errexit +set -o nounset if [ -e tests/shellcheck-tests.sh ]; then tests/shellcheck-tests.sh diff --git a/tests/shellcheck-tests.sh b/tests/shellcheck-tests.sh index 3a16387..9506f44 100755 --- a/tests/shellcheck-tests.sh +++ b/tests/shellcheck-tests.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Exit on errors -set -e +set -o errexit +set -o nounset # SC1117 was disabled after 0.5, because it was too pedantic EXCLUSIONS="--exclude=SC1117" diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh index 8520e8a..82688e6 100755 --- a/tests/unit-tests.sh +++ b/tests/unit-tests.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Exit on errors -set -e +set -o errexit +set -o nounset # Output is prefixed with the name of the script myname=$(basename "$0") diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 3c25021..d253455 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -12,6 +12,9 @@ # network-flavour: one of the files in the networks directory, # (default: 'bridges+hs-v23') +set -o errexit +set -o nounset + # Get a working chutney path if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then # looks like a broken path: use the path to this tool instead diff --git a/tools/diagnostics.sh b/tools/diagnostics.sh index e099514..fe5065a 100755 --- a/tools/diagnostics.sh +++ b/tools/diagnostics.sh @@ -17,6 +17,9 @@ # tools/diagnostics.sh # tools/diagnostics.sh 001a +set -o errexit +set -o nounset + if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then # looks like a broken path: use the path to this tool instead TOOLS_PATH=$(dirname "$0") diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh index b975f0a..8f42540 100755 --- a/tools/hsaddress.sh +++ b/tools/hsaddress.sh @@ -7,6 +7,9 @@ # Examples: tools/hsaddress.sh # tools/hsaddress.sh 025h +set -o errexit +set -o nounset + if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then # looks like a broken path: use the path to this tool instead TOOLS_PATH=$(dirname "$0") diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh index e73a154..afa1c80 100755 --- a/tools/test-network-impl.sh +++ b/tools/test-network-impl.sh @@ -1,5 +1,8 @@ #!/bin/sh +set -o errexit +set -o nounset + if ! "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR"; then if test "$?" = 77; then $ECHO "SKIP: $NETWORK_FLAVOUR not supported." diff --git a/tools/test-network.sh b/tools/test-network.sh index 09ed85c..91baa09 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -1,5 +1,8 @@ #!/bin/sh +set -o errexit +set -o nounset + export ECHO="${ECHO:-echo}" # Output is prefixed with the name of the script diff --git a/tools/warnings.sh b/tools/warnings.sh index 174393e..577c543 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -25,6 +25,9 @@ # CHUTNEY_WARNINGS_SKIP: # set to "true" to skip all warnings +set -o errexit +set -o nounset + if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then exit 0 fi

1 0