February 2019 - tor-commits - lists.torproject.org

[tor/maint-0.3.5] Fix coverage script.
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 192b312c977974680516e699c187d285f74ee8e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:43:38 2019 -0500 Fix coverage script. It was looking for object files made with the old automake directorations, but those changed when we split up our libraries. Fixes bug 29435; bugfix on 0.3.5.1-alpha. --- changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29435 b/changes/ticket29435 new file mode 100644 index 000000000..d48ae98e4 --- /dev/null +++ b/changes/ticket29435 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Fix our gcov wrapper script to look for object files at the + correct locations. Fixes bug 29435; bugfix on 0.3.5.1-alpha. diff --git a/scripts/test/coverage b/scripts/test/coverage index 59d468ee1..b6e17abe2 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -13,8 +13,8 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do F=`echo $BN | sed -e 's/\.c$//;'` GC="${BN}.gcov" # Figure out the object file names - ONS=`echo ${DN}/src_*-${F}.o` - ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + ONS=$(echo "${DN}"/*testing_a-"${F}".o) + ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o" # If the wildcard didn't expand, no files if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then

1 0

[tor/maint-0.3.5] Merge branch 'tor-github/pr/691' into maint-0.3.5
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 1216f99534319f4739cd6b90f7aa3633191c2179 Merge: 955ca72f9 192b312c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:46:52 2019 -0500 Merge branch 'tor-github/pr/691' into maint-0.3.5 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'ticket29435_035' into ticket29435_040
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit f2b646a2b6111763f30d6d5193340044a0b29b01 Merge: 7f59b9fb1 192b312c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:47:04 2019 -0500 Merge branch 'ticket29435_035' into ticket29435_040 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc scripts/test/coverage index 7a417cdc8,b6e17abe2..f61c83bc7 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@@ -8,13 -8,13 +8,13 @@@ dst=$1 for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do - BN=`basename $fn` - DN=`dirname $fn` - F=`echo $BN | sed -e 's/\.c$//;'` + BN=$(basename "$fn") + DN=$(dirname "$fn") + F=$(echo "$BN" | sed -e 's/\.c$//;') GC="${BN}.gcov" # Figure out the object file names - ONS=$(echo "${DN}"/src_*-"${F}".o) - ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + ONS=$(echo "${DN}"/*testing_a-"${F}".o) + ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o" # If the wildcard didn't expand, no files if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/691' into maint-0.3.5
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 1216f99534319f4739cd6b90f7aa3633191c2179 Merge: 955ca72f9 192b312c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:46:52 2019 -0500 Merge branch 'tor-github/pr/691' into maint-0.3.5 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Fix coverage script.
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 192b312c977974680516e699c187d285f74ee8e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:43:38 2019 -0500 Fix coverage script. It was looking for object files made with the old automake directorations, but those changed when we split up our libraries. Fixes bug 29435; bugfix on 0.3.5.1-alpha. --- changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29435 b/changes/ticket29435 new file mode 100644 index 000000000..d48ae98e4 --- /dev/null +++ b/changes/ticket29435 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Fix our gcov wrapper script to look for object files at the + correct locations. Fixes bug 29435; bugfix on 0.3.5.1-alpha. diff --git a/scripts/test/coverage b/scripts/test/coverage index 59d468ee1..b6e17abe2 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -13,8 +13,8 @@ for fn in src/core/*/*.c src/feature/*/*.c src/app/*/*.c src/lib/*/*.c; do F=`echo $BN | sed -e 's/\.c$//;'` GC="${BN}.gcov" # Figure out the object file names - ONS=`echo ${DN}/src_*-${F}.o` - ONS_WILDCARD_LITERAL="${DN}/src_*-${F}.o" + ONS=$(echo "${DN}"/*testing_a-"${F}".o) + ONS_WILDCARD_LITERAL="${DN}/*testing_a-${F}.o" # If the wildcard didn't expand, no files if [ "$ONS" != "${ONS_WILDCARD_LITERAL}" ] then

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 4746e1261b403302852e3107a986e663d2b063c1 Merge: 9c4ec414b 1216f9953 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:48:12 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/master] Merge branch 'tor-github/pr/692' into maint-0.4.0
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 9c4ec414bdebbb7bdfd4d613d3a84447acb10eec Merge: 35257a1c6 f2b646a2b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:47:54 2019 -0500 Merge branch 'tor-github/pr/692' into maint-0.4.0 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'tor-github/pr/692' into maint-0.4.0
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 9c4ec414bdebbb7bdfd4d613d3a84447acb10eec Merge: 35257a1c6 f2b646a2b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:47:54 2019 -0500 Merge branch 'tor-github/pr/692' into maint-0.4.0 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/691' into maint-0.3.5
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 1216f99534319f4739cd6b90f7aa3633191c2179 Merge: 955ca72f9 192b312c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:46:52 2019 -0500 Merge branch 'tor-github/pr/691' into maint-0.3.5 changes/ticket29435 | 3 +++ scripts/test/coverage | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit 3ac8cdb8cf93b3a80c18b66da34d77edd36ec377 Merge: 732855c2e 4746e1261 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:53:09 2019 -0500 Merge branch 'maint-0.4.0'

1 0