[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed Aug 29 11:17:31 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.2
Makefile.am | 3 ++-
changes/bug27295 | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
+ $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \
- ! grep -q FAIL test_network_log/*.trs
+ ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits