diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-02 09:17:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-02 09:17:24 -0400 |
| commit | fe4273fdc1527a129f62242767d7d83b9fb7bcd2 (patch) | |
| tree | 8d26b46622c62f775084a9563729e0e85ad02e3b | |
| parent | 569368e5a9a7f418caee513bfd4d4b4dfce9d032 (diff) | |
| parent | d9948dfc9d2b44de66e5a85a486c65a7e2781933 (diff) | |
| download | tor-fe4273fdc1527a129f62242767d7d83b9fb7bcd2.tar.gz tor-fe4273fdc1527a129f62242767d7d83b9fb7bcd2.zip | |
Merge remote-tracking branch 'teor/autodetect-chutney-path'
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | changes/autodetect-chutney-path | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 9b68d2752b..b5e71aad1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,9 +73,14 @@ test: all need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ - echo '$$CHUTNEY_PATH was not set.'; echo; \ - echo "To run these tests, git clone https://git.torproject.org/chutney.git ; export CHUTNEY_PATH=\`pwd\`/chutney"; \ - exit 1; \ + echo '$$CHUTNEY_PATH was not set.'; \ + if test -d $(top_srcdir)/../chutney -a -x $(top_srcdir)/../chutney/chutney; then \ + echo "Assuming test-network.sh will find" $(top_srcdir)/../chutney; \ + else \ + echo; \ + echo "To run these tests, git clone https://git.torproject.org/chutney.git ; export CHUTNEY_PATH=\`pwd\`/chutney"; \ + exit 1; \ + fi \ fi # Note that test-network requires a copy of Chutney in $CHUTNEY_PATH. diff --git a/changes/autodetect-chutney-path b/changes/autodetect-chutney-path new file mode 100644 index 0000000000..4da6b246e8 --- /dev/null +++ b/changes/autodetect-chutney-path @@ -0,0 +1,4 @@ + o Minor features (testing): + - Autodetect CHUTNEY_PATH if the chutney and tor sources are + side-by-side in the same parent directory. + Closes ticket 16903. Patch by "teor". |