December 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 9d49dd60dd456421221d8a6d8a17940d4b560c7b Merge: eaa69a2 254d63d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 15:45:36 2015 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 src/test/include.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.7] Only setup environment variables for tests
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 670affa792e7613f6e6b5d960805418359ac0ec7 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 25 16:39:11 2015 +0200 Only setup environment variables for tests Using the AM_TESTS_ENVIRONMENT variable ensures the environment variables are only set during test execution and not during the compilation phase. --- Makefile.am | 7 +++++++ src/or/include.am | 3 --- src/test/include.am | 11 ++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index c226113..beea69d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,13 @@ bin_SCRIPTS= AM_CPPFLAGS= AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@ SHELL = @SHELL@ + +if COVERAGE_ENABLED +TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov" +else +TESTING_TOR_BINARY="$(top_builddir)/src/or/tor" +endif + include src/include.am include doc/include.am include contrib/include.am diff --git a/src/or/include.am b/src/or/include.am index d0e955f..a3ac49c 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,9 +123,6 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ -export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov -else -export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor endif ORHEADERS = \ diff --git a/src/test/include.am b/src/test/include.am index a37fe23..a24c5bb 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,9 @@ - -export PYTHON=@PYTHON@ -export SHELL=@SHELL@ -export abs_top_srcdir=@abs_top_srcdir@ -export builddir=@builddir@ +AM_TESTS_ENVIRONMENT = \ + export PYTHON=@PYTHON@; \ + export SHELL=@SHELL@; \ + export abs_top_srcdir=@abs_top_srcdir@; \ + export builddir=@builddir@; \ + export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit eaa69a22893bf51223687091f52af5b62e8a327a Merge: e033126 ff843ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 14 13:30:30 2015 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 Makefile.am | 7 +++++++ changes/bug17818 | 3 +++ src/or/include.am | 3 --- src/test/include.am | 11 ++++++----- 4 files changed, 16 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.7] Add changes file for 17818
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit ff843ed39f78ac9762c80261ade580d31fb3a9a9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Dec 12 00:06:41 2015 +0100 Add changes file for 17818 --- changes/bug17818 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug17818 b/changes/bug17818 new file mode 100644 index 0000000..3d9afe3 --- /dev/null +++ b/changes/bug17818 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Isolate environment variables meant for tests from the rest of the + build system. Fixes bug 17818; bugfix on tor-0.2.7.3-rc.

1 0

[tor/release-0.2.7] Use variables instead of substitutions
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 01a9575ad049643656254911167da901f0f7b04c Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 11 23:51:17 2015 +0100 Use variables instead of substitutions Using variables removes the ambiguity about when to use variables and when to use substitutions. Variables always work. Substitutions only work when Autoconf knows about them which is not always the case. The variables are also placed between quotes to ensures spaces in the variables are handled properly. --- src/test/include.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index a24c5bb..9577e1e 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,8 @@ AM_TESTS_ENVIRONMENT = \ - export PYTHON=@PYTHON@; \ - export SHELL=@SHELL@; \ - export abs_top_srcdir=@abs_top_srcdir@; \ - export builddir=@builddir@; \ + export PYTHON="$(PYTHON)"; \ + export SHELL="$(SHELL)"; \ + export abs_top_srcdir="$(abs_top_srcdir)"; \ + export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh

1 0

[tor/maint-0.2.7] Only setup environment variables for tests
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 670affa792e7613f6e6b5d960805418359ac0ec7 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 25 16:39:11 2015 +0200 Only setup environment variables for tests Using the AM_TESTS_ENVIRONMENT variable ensures the environment variables are only set during test execution and not during the compilation phase. --- Makefile.am | 7 +++++++ src/or/include.am | 3 --- src/test/include.am | 11 ++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index c226113..beea69d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,13 @@ bin_SCRIPTS= AM_CPPFLAGS= AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@ SHELL = @SHELL@ + +if COVERAGE_ENABLED +TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov" +else +TESTING_TOR_BINARY="$(top_builddir)/src/or/tor" +endif + include src/include.am include doc/include.am include contrib/include.am diff --git a/src/or/include.am b/src/or/include.am index d0e955f..a3ac49c 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,9 +123,6 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ -export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov -else -export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor endif ORHEADERS = \ diff --git a/src/test/include.am b/src/test/include.am index a37fe23..a24c5bb 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,9 @@ - -export PYTHON=@PYTHON@ -export SHELL=@SHELL@ -export abs_top_srcdir=@abs_top_srcdir@ -export builddir=@builddir@ +AM_TESTS_ENVIRONMENT = \ + export PYTHON=@PYTHON@; \ + export SHELL=@SHELL@; \ + export abs_top_srcdir=@abs_top_srcdir@; \ + export builddir=@builddir@; \ + export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh

1 0

[tor/maint-0.2.7] Use variables instead of substitutions
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 01a9575ad049643656254911167da901f0f7b04c Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 11 23:51:17 2015 +0100 Use variables instead of substitutions Using variables removes the ambiguity about when to use variables and when to use substitutions. Variables always work. Substitutions only work when Autoconf knows about them which is not always the case. The variables are also placed between quotes to ensures spaces in the variables are handled properly. --- src/test/include.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index a24c5bb..9577e1e 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,8 @@ AM_TESTS_ENVIRONMENT = \ - export PYTHON=@PYTHON@; \ - export SHELL=@SHELL@; \ - export abs_top_srcdir=@abs_top_srcdir@; \ - export builddir=@builddir@; \ + export PYTHON="$(PYTHON)"; \ + export SHELL="$(SHELL)"; \ + export abs_top_srcdir="$(abs_top_srcdir)"; \ + export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh

1 0

[tor/maint-0.2.7] Add changes file for 17818
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit ff843ed39f78ac9762c80261ade580d31fb3a9a9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Dec 12 00:06:41 2015 +0100 Add changes file for 17818 --- changes/bug17818 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug17818 b/changes/bug17818 new file mode 100644 index 0000000..3d9afe3 --- /dev/null +++ b/changes/bug17818 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Isolate environment variables meant for tests from the rest of the + build system. Fixes bug 17818; bugfix on tor-0.2.7.3-rc.

1 0

[tor/master] Only setup environment variables for tests
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 670affa792e7613f6e6b5d960805418359ac0ec7 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 25 16:39:11 2015 +0200 Only setup environment variables for tests Using the AM_TESTS_ENVIRONMENT variable ensures the environment variables are only set during test execution and not during the compilation phase. --- Makefile.am | 7 +++++++ src/or/include.am | 3 --- src/test/include.am | 11 ++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index c226113..beea69d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,13 @@ bin_SCRIPTS= AM_CPPFLAGS= AM_CFLAGS = @TOR_SYSTEMD_CFLAGS@ SHELL = @SHELL@ + +if COVERAGE_ENABLED +TESTING_TOR_BINARY="$(top_builddir)/src/or/tor-cov" +else +TESTING_TOR_BINARY="$(top_builddir)/src/or/tor" +endif + include src/include.am include doc/include.am include contrib/include.am diff --git a/src/or/include.am b/src/or/include.am index d0e955f..a3ac49c 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,9 +123,6 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ -export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov -else -export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor endif ORHEADERS = \ diff --git a/src/test/include.am b/src/test/include.am index a37fe23..a24c5bb 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,9 @@ - -export PYTHON=@PYTHON@ -export SHELL=@SHELL@ -export abs_top_srcdir=@abs_top_srcdir@ -export builddir=@builddir@ +AM_TESTS_ENVIRONMENT = \ + export PYTHON=@PYTHON@; \ + export SHELL=@SHELL@; \ + export abs_top_srcdir=@abs_top_srcdir@; \ + export builddir=@builddir@; \ + export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh

1 0

[tor/master] Use variables instead of substitutions
by nickm＠torproject.org 14 Dec '15

14 Dec '15

commit 01a9575ad049643656254911167da901f0f7b04c Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 11 23:51:17 2015 +0100 Use variables instead of substitutions Using variables removes the ambiguity about when to use variables and when to use substitutions. Variables always work. Substitutions only work when Autoconf knows about them which is not always the case. The variables are also placed between quotes to ensures spaces in the variables are handled properly. --- src/test/include.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index a24c5bb..9577e1e 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -1,8 +1,8 @@ AM_TESTS_ENVIRONMENT = \ - export PYTHON=@PYTHON@; \ - export SHELL=@SHELL@; \ - export abs_top_srcdir=@abs_top_srcdir@; \ - export builddir=@builddir@; \ + export PYTHON="$(PYTHON)"; \ + export SHELL="$(SHELL)"; \ + export abs_top_srcdir="$(abs_top_srcdir)"; \ + export builddir="$(builddir)"; \ export TESTING_TOR_BINARY="$(TESTING_TOR_BINARY)"; TESTSCRIPTS = src/test/test_zero_length_keys.sh

1 0