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

[tor/maint-0.4.3] CI: improve output when skipping doxygen
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:13:56 2020 -0400 CI: improve output when skipping doxygen --- scripts/ci/ci-driver.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index ba4b800c04..6faffd7b40 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}" if [[ "${COLOR_CI}" == "yes" ]]; then T_RED=$(tput setaf 1 || true) T_GREEN=$(tput setaf 2 || true) + T_YELLOW=$(tput setaf 3 || true) T_DIM=$(tput dim || true) T_BOLD=$(tput bold || true) T_RESET=$(tput sgr0 || true) else T_RED= T_GREEN= + T_YELLOW= T_DIM= T_BOLD= T_RESET= @@ -85,6 +87,12 @@ function die() echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2 exit 1 } + +function skipping() +{ + echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}" +} + function hooray() { echo "${T_BOLD}${T_GREEN}$*${T_RESET}" @@ -363,12 +371,16 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' ]]; then start_section Doxygen - if runcmd make doxygen; then - hooray "make doxygen has succeeded." + if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then + if runcmd make doxygen; then + hooray "make doxygen has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} doxygen" + fi else - FAILED_TESTS="${FAILED_TESTS} doxygen" + skipping "make doxygen: doxygen is broken for Tor < 0.4.3" fi end_section Doxygen fi

1 0

[tor/maint-0.4.3] Try disabling "make all" when checking docs.
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 11:35:15 2020 -0400 Try disabling "make all" when checking docs. --- .gitlab-ci.yml | 2 +- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 54 ++++++++++++++++++------------------------------- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3959bba024..8ed615687b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,6 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh -# TODO: it would be neat to disable the "make all" part of this one. debian-docs: image: debian:stable <<: *debian-template @@ -119,6 +118,7 @@ debian-docs: DOXYGEN: "yes" ASCIIDOC: "yes" CHECK: "no" + RUN_STAGE_BUILD: "no" script: - ./scripts/ci/ci-driver.sh diff --git a/Makefile.am b/Makefile.am index 5d18666edc..a868be7362 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,6 +149,8 @@ include src/include.am include doc/include.am include contrib/include.am +manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ ChangeLog \ CONTRIBUTING \ diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 05c1415da0..ba4b800c04 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}" # Options for which CI system this is. ON_GITLAB="${ON_GITLAB:-yes}" +# Options for things we usually won't want to skip. +RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}" +RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}" +RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}" + # Options for how to build Tor. All should be yes/no. FATAL_WARNINGS="${FATAL_WARNINGS:-yes}" HARDENING="${HARDENING:-no}" @@ -165,33 +170,6 @@ else } fi -if [[ "$*" == "" ]]; then - RUN_STAGE_CONFIGURE="yes" - RUN_STAGE_BUILD="yes" - RUN_STAGE_TEST="yes" -else - RUN_STAGE_CONFIGURE="no" - RUN_STAGE_BUILD="no" - RUN_STAGE_TEST="no" - - for stage in "$@"; do - case "$stage" in - configure) - RUN_STAGE_CONFIGURE="yes" - ;; - build) - RUN_STAGE_BUILD="yes" - ;; - test) - RUN_STAGE_TEST="yes" - ;; - *) - error "Unknown stage $stage" - ;; - esac - done -fi - ############################################################################# # Validate inputs. @@ -206,6 +184,10 @@ yes_or_no RUST yes_or_no DOXYGEN yes_or_no ASCIIDOC +yes_or_no RUN_STAGE_CONFIGURE +yes_or_no RUN_STAGE_BUILD +yes_or_no RUN_STAGE_TEST + yes_or_no CHECK yes_or_no STEM yes_or_no DISTCHECK @@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then end_section Distcheck fi fi + ############################## # Run tests. @@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then exit 0 fi -if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then - debug "Skipped build stage. Making sure that ./src/app/tor exists." - if [[ ! -f "./src/app/tor" ]]; then - die "$(pwd)/src/app/tor does not exist" - fi -fi - FAILED_TESTS="" if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then @@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then end_section Doxygen fi +if [[ "${ASCIIDOC}" = 'yes' ]]; then + start_section Asciidoc + if runcmd make manpages; then + hooray "make manpages has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} asciidoc" + fi + end_section Asciidoc +fi + if [[ "${CHECK}" = "yes" ]]; then start_section "Check" if runcmd make "${make_options[@]}" check; then

1 0

[tor/maint-0.4.2] CI: improve output when skipping doxygen
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:13:56 2020 -0400 CI: improve output when skipping doxygen --- scripts/ci/ci-driver.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index ba4b800c04..6faffd7b40 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}" if [[ "${COLOR_CI}" == "yes" ]]; then T_RED=$(tput setaf 1 || true) T_GREEN=$(tput setaf 2 || true) + T_YELLOW=$(tput setaf 3 || true) T_DIM=$(tput dim || true) T_BOLD=$(tput bold || true) T_RESET=$(tput sgr0 || true) else T_RED= T_GREEN= + T_YELLOW= T_DIM= T_BOLD= T_RESET= @@ -85,6 +87,12 @@ function die() echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2 exit 1 } + +function skipping() +{ + echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}" +} + function hooray() { echo "${T_BOLD}${T_GREEN}$*${T_RESET}" @@ -363,12 +371,16 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' ]]; then start_section Doxygen - if runcmd make doxygen; then - hooray "make doxygen has succeeded." + if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then + if runcmd make doxygen; then + hooray "make doxygen has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} doxygen" + fi else - FAILED_TESTS="${FAILED_TESTS} doxygen" + skipping "make doxygen: doxygen is broken for Tor < 0.4.3" fi end_section Doxygen fi

1 0

[tor/maint-0.4.3] CI: Try to enable integration tests, hardening, and clang.
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 09:38:19 2020 -0400 CI: Try to enable integration tests, hardening, and clang. --- .gitlab-ci.yml | 34 +++++++++++++++++++++++++--------- scripts/ci/ci-driver.sh | 3 +++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abc5003678..3959bba024 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,7 @@ variables: - apt-get install automake build-essential + ca-certificates git libevent-dev liblzma-dev @@ -77,6 +78,10 @@ variables: zlib1g-dev - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi + - if [ "$STEM" = yes ]; then apt-get install timelimit; fi + - if [ "$CC" = clang ]; then apt-get install clang; fi + - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi + - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi debian-minimal: image: debian:stable @@ -84,17 +89,18 @@ debian-minimal: script: - ./scripts/ci/ci-driver.sh -############################################### -# Temporarily diabled. This one just takes too long to finish right now! + +# TODO: This one just takes too long to finish right now! # Maybe we need to divide the call to ./src/test/test into a few segments, # that all end in similar amount of time? -#debian-hardened: -# image: debian:testing -# <<: *debian-template -# variables: -# HARDENING: "yes" -# script: -# - ./scripts/ci/ci-driver.sh +debian-hardened: + image: debian:testing + <<: *debian-template + variables: + HARDENING: "yes" + CC: "clang" + script: + - ./scripts/ci/ci-driver.sh debian-distcheck: image: debian:stable @@ -115,3 +121,13 @@ debian-docs: CHECK: "no" script: - ./scripts/ci/ci-driver.sh + +debian-integration: + image: debian:stable + <<: *debian-template + variables: + CHECK: "no" + CHUTNEY: "yes" + # STEM: "yes" -- currently failing on <044. + script: + - ./scripts/ci/ci-driver.sh diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index ad08ee5af0..05c1415da0 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -411,10 +411,13 @@ fi if [[ "${CHUTNEY}" = "yes" ]]; then start_section "Chutney" + export CHUTNEY_TOR_SANDBOX=0 + export CHUTNEY_ALLOW_FAILURES=2 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then hooray "Chutney tests have succeeded" else error "Chutney says:" + export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net" runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true # XXXX These next two should be part of a make target. runcmd ls test_network_log || true

1 0

[tor/maint-0.4.4] Try disabling "make all" when checking docs.
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 11:35:15 2020 -0400 Try disabling "make all" when checking docs. --- .gitlab-ci.yml | 2 +- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 54 ++++++++++++++++++------------------------------- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3959bba024..8ed615687b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,6 @@ debian-distcheck: script: - ./scripts/ci/ci-driver.sh -# TODO: it would be neat to disable the "make all" part of this one. debian-docs: image: debian:stable <<: *debian-template @@ -119,6 +118,7 @@ debian-docs: DOXYGEN: "yes" ASCIIDOC: "yes" CHECK: "no" + RUN_STAGE_BUILD: "no" script: - ./scripts/ci/ci-driver.sh diff --git a/Makefile.am b/Makefile.am index 5d18666edc..a868be7362 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,6 +149,8 @@ include src/include.am include doc/include.am include contrib/include.am +manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ ChangeLog \ CONTRIBUTING \ diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 05c1415da0..ba4b800c04 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}" # Options for which CI system this is. ON_GITLAB="${ON_GITLAB:-yes}" +# Options for things we usually won't want to skip. +RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}" +RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}" +RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}" + # Options for how to build Tor. All should be yes/no. FATAL_WARNINGS="${FATAL_WARNINGS:-yes}" HARDENING="${HARDENING:-no}" @@ -165,33 +170,6 @@ else } fi -if [[ "$*" == "" ]]; then - RUN_STAGE_CONFIGURE="yes" - RUN_STAGE_BUILD="yes" - RUN_STAGE_TEST="yes" -else - RUN_STAGE_CONFIGURE="no" - RUN_STAGE_BUILD="no" - RUN_STAGE_TEST="no" - - for stage in "$@"; do - case "$stage" in - configure) - RUN_STAGE_CONFIGURE="yes" - ;; - build) - RUN_STAGE_BUILD="yes" - ;; - test) - RUN_STAGE_TEST="yes" - ;; - *) - error "Unknown stage $stage" - ;; - esac - done -fi - ############################################################################# # Validate inputs. @@ -206,6 +184,10 @@ yes_or_no RUST yes_or_no DOXYGEN yes_or_no ASCIIDOC +yes_or_no RUN_STAGE_CONFIGURE +yes_or_no RUN_STAGE_BUILD +yes_or_no RUN_STAGE_TEST + yes_or_no CHECK yes_or_no STEM yes_or_no DISTCHECK @@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then end_section Distcheck fi fi + ############################## # Run tests. @@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then exit 0 fi -if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then - debug "Skipped build stage. Making sure that ./src/app/tor exists." - if [[ ! -f "./src/app/tor" ]]; then - die "$(pwd)/src/app/tor does not exist" - fi -fi - FAILED_TESTS="" if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then @@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then end_section Doxygen fi +if [[ "${ASCIIDOC}" = 'yes' ]]; then + start_section Asciidoc + if runcmd make manpages; then + hooray "make manpages has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} asciidoc" + fi + end_section Asciidoc +fi + if [[ "${CHECK}" = "yes" ]]; then start_section "Check" if runcmd make "${make_options[@]}" check; then

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b Merge: 489d33e190 02bb719a94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-) diff --cc Makefile.am index 3b30c01f00,f6346fe0fc..1041494da7 --- a/Makefile.am +++ b/Makefile.am @@@ -162,53 -157,40 +162,55 @@@ include src/include.a include doc/include.am include contrib/include.am + manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ - ChangeLog \ - CONTRIBUTING \ - CODE_OF_CONDUCT \ - INSTALL \ - LICENSE \ - Makefile.nmake \ - README \ - ReleaseNotes \ - scripts/maint/checkIncludes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/checkShellScripts.sh \ - scripts/maint/practracker/README \ - scripts/maint/practracker/exceptions.txt \ - scripts/maint/practracker/includes.py \ - scripts/maint/practracker/metrics.py \ - scripts/maint/practracker/practracker.py \ - scripts/maint/practracker/practracker_tests.py \ - scripts/maint/practracker/problem.py \ - scripts/maint/practracker/testdata/.may_include \ - scripts/maint/practracker/testdata/a.c \ - scripts/maint/practracker/testdata/b.c \ - scripts/maint/practracker/testdata/ex0-expected.txt \ - scripts/maint/practracker/testdata/ex0.txt \ - scripts/maint/practracker/testdata/ex1-expected.txt \ - scripts/maint/practracker/testdata/ex1.txt \ - scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ - scripts/maint/practracker/testdata/ex.txt \ - scripts/maint/practracker/testdata/header.h \ - scripts/maint/practracker/testdata/not_c_file \ - scripts/maint/practracker/test_practracker.sh \ - scripts/maint/practracker/util.py + ChangeLog \ + CONTRIBUTING \ + CODE_OF_CONDUCT \ + INSTALL \ + LICENSE \ + Makefile.nmake \ + README \ + ReleaseNotes \ + scripts/maint/checkIncludes.py \ + scripts/maint/checkSpace.pl \ + scripts/maint/checkSpaceTest.sh \ + scripts/maint/checkspace_tests/dubious.c \ + scripts/maint/checkspace_tests/dubious.h \ + scripts/maint/checkspace_tests/expected.txt \ + scripts/maint/checkspace_tests/good_guard.h \ + scripts/maint/checkspace_tests/same_guard.h \ + scripts/maint/checkspace_tests/subdir/dubious.c \ + scripts/maint/checkShellScripts.sh \ + scripts/maint/practracker/README \ + scripts/maint/practracker/exceptions.txt \ + scripts/maint/practracker/includes.py \ + scripts/maint/practracker/metrics.py \ + scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/practracker_tests.py \ + scripts/maint/practracker/problem.py \ + scripts/maint/practracker/testdata/.may_include \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex.txt \ + scripts/maint/practracker/testdata/header.h \ + scripts/maint/practracker/testdata/not_c_file \ + scripts/maint/practracker/test_practracker.sh \ + scripts/maint/practracker/util.py \ + scripts/coccinelle/apply.sh \ + scripts/coccinelle/check_cocci_parse.sh \ + scripts/coccinelle/exceptions.txt \ + scripts/coccinelle/test-operator-cleanup \ + scripts/coccinelle/tor-coccinelle.h \ + scripts/coccinelle/try_parse.sh ## This tells etags how to find mockable function definitions. AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*$[a-zA-Z0-9_]+$\W*,/\1/s'

1 0

[tor/maint-0.4.4] CI: Try to enable integration tests, hardening, and clang.
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 09:38:19 2020 -0400 CI: Try to enable integration tests, hardening, and clang. --- .gitlab-ci.yml | 34 +++++++++++++++++++++++++--------- scripts/ci/ci-driver.sh | 3 +++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abc5003678..3959bba024 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,7 @@ variables: - apt-get install automake build-essential + ca-certificates git libevent-dev liblzma-dev @@ -77,6 +78,10 @@ variables: zlib1g-dev - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi + - if [ "$STEM" = yes ]; then apt-get install timelimit; fi + - if [ "$CC" = clang ]; then apt-get install clang; fi + - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi + - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi debian-minimal: image: debian:stable @@ -84,17 +89,18 @@ debian-minimal: script: - ./scripts/ci/ci-driver.sh -############################################### -# Temporarily diabled. This one just takes too long to finish right now! + +# TODO: This one just takes too long to finish right now! # Maybe we need to divide the call to ./src/test/test into a few segments, # that all end in similar amount of time? -#debian-hardened: -# image: debian:testing -# <<: *debian-template -# variables: -# HARDENING: "yes" -# script: -# - ./scripts/ci/ci-driver.sh +debian-hardened: + image: debian:testing + <<: *debian-template + variables: + HARDENING: "yes" + CC: "clang" + script: + - ./scripts/ci/ci-driver.sh debian-distcheck: image: debian:stable @@ -115,3 +121,13 @@ debian-docs: CHECK: "no" script: - ./scripts/ci/ci-driver.sh + +debian-integration: + image: debian:stable + <<: *debian-template + variables: + CHECK: "no" + CHUTNEY: "yes" + # STEM: "yes" -- currently failing on <044. + script: + - ./scripts/ci/ci-driver.sh diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index ad08ee5af0..05c1415da0 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -411,10 +411,13 @@ fi if [[ "${CHUTNEY}" = "yes" ]]; then start_section "Chutney" + export CHUTNEY_TOR_SANDBOX=0 + export CHUTNEY_ALLOW_FAILURES=2 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then hooray "Chutney tests have succeeded" else error "Chutney says:" + export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net" runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true # XXXX These next two should be part of a make target. runcmd ls test_network_log || true

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 02bb719a9494a010b3cad4cf81942ec7619f5806 Merge: 6ef40144ae f5b9471547 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-)

1 0

[tor/maint-0.4.4] CI: improve output when skipping doxygen
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:13:56 2020 -0400 CI: improve output when skipping doxygen --- scripts/ci/ci-driver.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index ba4b800c04..6faffd7b40 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}" if [[ "${COLOR_CI}" == "yes" ]]; then T_RED=$(tput setaf 1 || true) T_GREEN=$(tput setaf 2 || true) + T_YELLOW=$(tput setaf 3 || true) T_DIM=$(tput dim || true) T_BOLD=$(tput bold || true) T_RESET=$(tput sgr0 || true) else T_RED= T_GREEN= + T_YELLOW= T_DIM= T_BOLD= T_RESET= @@ -85,6 +87,12 @@ function die() echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2 exit 1 } + +function skipping() +{ + echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}" +} + function hooray() { echo "${T_BOLD}${T_GREEN}$*${T_RESET}" @@ -363,12 +371,16 @@ fi FAILED_TESTS="" -if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then +if [[ "${DOXYGEN}" = 'yes' ]]; then start_section Doxygen - if runcmd make doxygen; then - hooray "make doxygen has succeeded." + if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then + if runcmd make doxygen; then + hooray "make doxygen has succeeded." + else + FAILED_TESTS="${FAILED_TESTS} doxygen" + fi else - FAILED_TESTS="${FAILED_TESTS} doxygen" + skipping "make doxygen: doxygen is broken for Tor < 0.4.3" fi end_section Doxygen fi

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 12 Aug '20

12 Aug '20

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b Merge: 489d33e190 02bb719a94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-) diff --cc Makefile.am index 3b30c01f00,f6346fe0fc..1041494da7 --- a/Makefile.am +++ b/Makefile.am @@@ -162,53 -157,40 +162,55 @@@ include src/include.a include doc/include.am include contrib/include.am + manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ - ChangeLog \ - CONTRIBUTING \ - CODE_OF_CONDUCT \ - INSTALL \ - LICENSE \ - Makefile.nmake \ - README \ - ReleaseNotes \ - scripts/maint/checkIncludes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/checkShellScripts.sh \ - scripts/maint/practracker/README \ - scripts/maint/practracker/exceptions.txt \ - scripts/maint/practracker/includes.py \ - scripts/maint/practracker/metrics.py \ - scripts/maint/practracker/practracker.py \ - scripts/maint/practracker/practracker_tests.py \ - scripts/maint/practracker/problem.py \ - scripts/maint/practracker/testdata/.may_include \ - scripts/maint/practracker/testdata/a.c \ - scripts/maint/practracker/testdata/b.c \ - scripts/maint/practracker/testdata/ex0-expected.txt \ - scripts/maint/practracker/testdata/ex0.txt \ - scripts/maint/practracker/testdata/ex1-expected.txt \ - scripts/maint/practracker/testdata/ex1.txt \ - scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ - scripts/maint/practracker/testdata/ex.txt \ - scripts/maint/practracker/testdata/header.h \ - scripts/maint/practracker/testdata/not_c_file \ - scripts/maint/practracker/test_practracker.sh \ - scripts/maint/practracker/util.py + ChangeLog \ + CONTRIBUTING \ + CODE_OF_CONDUCT \ + INSTALL \ + LICENSE \ + Makefile.nmake \ + README \ + ReleaseNotes \ + scripts/maint/checkIncludes.py \ + scripts/maint/checkSpace.pl \ + scripts/maint/checkSpaceTest.sh \ + scripts/maint/checkspace_tests/dubious.c \ + scripts/maint/checkspace_tests/dubious.h \ + scripts/maint/checkspace_tests/expected.txt \ + scripts/maint/checkspace_tests/good_guard.h \ + scripts/maint/checkspace_tests/same_guard.h \ + scripts/maint/checkspace_tests/subdir/dubious.c \ + scripts/maint/checkShellScripts.sh \ + scripts/maint/practracker/README \ + scripts/maint/practracker/exceptions.txt \ + scripts/maint/practracker/includes.py \ + scripts/maint/practracker/metrics.py \ + scripts/maint/practracker/practracker.py \ + scripts/maint/practracker/practracker_tests.py \ + scripts/maint/practracker/problem.py \ + scripts/maint/practracker/testdata/.may_include \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex.txt \ + scripts/maint/practracker/testdata/header.h \ + scripts/maint/practracker/testdata/not_c_file \ + scripts/maint/practracker/test_practracker.sh \ + scripts/maint/practracker/util.py \ + scripts/coccinelle/apply.sh \ + scripts/coccinelle/check_cocci_parse.sh \ + scripts/coccinelle/exceptions.txt \ + scripts/coccinelle/test-operator-cleanup \ + scripts/coccinelle/tor-coccinelle.h \ + scripts/coccinelle/try_parse.sh ## This tells etags how to find mockable function definitions. AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*$[a-zA-Z0-9_]+$\W*,/\1/s'

1 0