torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autodetect CHUTNEY_PATH if chutney is next to tor

Browse Source 
If the chutney and tor sources are side-by-side in the same
parent directory, autodetect the chutney path.

Closes ticket 16903. Patch by "teor".
This commit is contained in:
teor (Tim Wilson-Brown)
2015-08-27 10:31:35 +10:00
parent b531fc7d9a
commit d9948dfc9d
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+8 -3
View File
@@ -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.
changes/autodetect-chutney-path
+4
View File
@@ -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".
src/test/test-network.sh
+8
View File
@@ -59,8 +59,16 @@ NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic}
CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
myname=$(basename $0)
[ -n "$CHUTNEY_PATH" ] || {
echo "$myname: \$CHUTNEY_PATH not set, trying $TOR_DIR/../chutney"
CHUTNEY_PATH="$TOR_DIR/../chutney"
}
[ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || {
echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)"
echo "$myname: Get chutney: git clone https://git.torproject.org/\
chutney.git"
echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export CHUTNEY_PATH=\`pwd\`/chutney"
exit 1
}