[master 1/1] Collect test-suite.log from all 'make check' invocations. Closes #452

atodorov installerbot-noreply at redhat.com
Fri Nov 13 11:26:58 UTC 2015


From: Alexander Todorov <atodorov at redhat.com>

---
 .gitignore  |  2 +-
 Makefile.am | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 65adceb..3eb8324 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,7 +80,7 @@ tests/*.log
 tests/*.trs
 tests/.coverage.*
 tests/pylint/.pylint.d
-tests/test-suite.log
+tests/test-suite.log*
 updates.img
 utils/dd/dd_extract
 utils/dd/dd_list
diff --git a/Makefile.am b/Makefile.am
index 4e95e12..3e0ae5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,19 +170,25 @@ runglade:
 	glade ${GLADE_FILE}
 
 ci: rc-release
+	@rm -f tests/test-suite.log.*
 	@mkdir -p $(USER_SITE_PACKAGES)
 	@cp $(abs_builddir)/tests/usercustomize.py $(USER_SITE_PACKAGES)
 	@sudo mkdir -p $(ROOT_SITE_PACKAGES)
 	@sudo cp $(abs_builddir)/tests/usercustomize.py $(ROOT_SITE_PACKAGES)
 	$(MAKE) -C utils/dd
-	$(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc check
-	@sudo $(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc \
-		TESTS=nosetests_root.sh check
+	$(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc \
+		TEST_SUITE_LOG=test-suite.log.$$$$ check
 	@tail -n 1 tests/gettext_tests/*.log > tests/gettext_tests/gettext_tests.log
+	@sudo $(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc \
+		TEST_SUITE_LOG=test-suite.log.$$$$ TESTS=nosetests_root.sh check
 	@mkdir -p repo
 	@mv *rpm repo
 	@createrepo -p repo
-	@sudo $(MAKE) TMPDIR=/var/tmp TESTS=install/run_install_test.sh TEST_ANACONDA_REPO=file://$(abs_builddir)/repo/ COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc check
+	@sudo $(MAKE) TMPDIR=/var/tmp COVERAGE_PROCESS_START=$(abs_builddir)/.coveragerc \
+		TEST_SUITE_LOG=test-suite.log.$$$$ TESTS=install/run_install_test.sh \
+		TEST_ANACONDA_REPO=file://$(abs_builddir)/repo/ check
+	@cat tests/test-suite.log.* > tests/test-suite.log
+	@rm -f tests/test-suite.log.*
 	@rm -f $(USER_SITE_PACKAGES)/usercustomize.py
 	@sudo rm -f $(ROOT_SITE_PACKAGES)/usercustomize.py
 	$(MAKE) coverage-report


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/1359f560fe10e5154b58a88530d6d2f9869284ba


More information about the anaconda-patches mailing list