Ticket #19421: 0001-Fix-test-network-all-target-in-out-of-tree-builds.patch

File 0001-Fix-test-network-all-target-in-out-of-tree-builds.patch, 2.1 KB (added by cypherpunks, 4 years ago)
  • Makefile.am

    From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    From: cypherpunks <cypherpunks@torproject.org>
    Date: Thu, 16 Jun 2016 12:16:57 +0000
    Subject: [PATCH] Fix test-network-all target in out-of-tree builds
    
    The test-network-all target assumes the test-driver script lives in the
    current working directory. This assumption breaks out-of-tree builds
    because it actually lives in the source directory.
    
    Automake 1.12 introduces `LOG_DRIVER` which defines the location of the
    test driver script. Because Tor still supports Automake 1.11 we use the
    default value of this variable directly. The default value uses the
    configured shell for calling the test driver script and explicitly
    prefixes the source directory.
    ---
     Makefile.am      | 2 +-
     changes/bug19421 | 4 ++++
     2 files changed, 5 insertions(+), 1 deletion(-)
     create mode 100644 changes/bug19421
    
    diff --git a/Makefile.am b/Makefile.am
    index a8aa3af..3328864 100644
    a b test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ 
    122122                echo "SKIP: $$f"; \
    123123        done; \
    124124        for f in $$flavors; do \
    125                 ./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); \
     125                $(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); \
    126126        done; \
    127127        echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \
    128128        ! grep -q FAIL test_network_log/*.trs
  • new file changes/bug19421

    diff --git a/changes/bug19421 b/changes/bug19421
    new file mode 100644
    index 0000000..c7aba26
    - +  
     1  o Minor bugfixes (testing):
     2    - Fix the test-network-all target on out-of-tree builds by using the
     3      correct path to the test driver script. Fixes bug #19421; bugfix on
     4      0.2.7.3-rc.