[ng] check: keep cleaning of '.log' and '.trs' files near other rules

* lib/am/parallel-tests.am: Add $(am__test_results), $(am__test_logs)
and $(TEST_SUITE_LOGS) to the list of files removed by "make mostlyclean"
here ...
* automake.in (handle_tests): ... rather than here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 293471daa33ed44ca54551837594e655c5524563..eba5266dabbd5f1c767caa0c73b7f3990566ae64 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -4155,9 +4155,6 @@ sub handle_tests
             file_contents ('parallel-tests', new Automake::Location,
                            COLOR => !! option 'color-tests',
                            CHECK_DEPS => "@check");
-         $clean_files{'$(am__test_logs)'} = MOSTLY_CLEAN;
-         $clean_files{'$(am__test_results)'} = MOSTLY_CLEAN;
-         $clean_files{'$(TEST_SUITE_LOG)'} = MOSTLY_CLEAN;
        }
     }
 }

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 8f4c0f96c129f8447224d8079aa890a30d432654..e030c87c73f09c3b74174e23118ae93f98a996df 100644 (file)
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -256,6 +256,8 @@ am__test_results = \
 am__test_logs = \
   $(call am__memoize,am__test_logs,$(addsuffix .log,$(strip $(am__test_bases))))
 
+am__mostlyclean_files += $(am__test_results) $(am__test_logs)
+
 # $(TEST_LOGS) is a published interface.
 TEST_LOGS = $(am__test_logs)
 
@@ -377,6 +379,8 @@ $(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results)
        fi;                                                             \
        $$success || exit 1
 
+am__mostlyclean_files += $(TEST_SUITE_LOG)
+
 ## ------------------------------------------ ##
 ## Running all tests, or rechecking failures. ##
 ## ------------------------------------------ ##