From 0ff64c6ed799f2626bf4b2481d0c4957c4e63af7 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Mon, 21 Sep 2020 15:43:50 -0400 Subject: [PATCH 1/4] Update binutils mirrors from Sam's old branch --- packages/taucmdr/cf/software/binutils_installation.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/taucmdr/cf/software/binutils_installation.py b/packages/taucmdr/cf/software/binutils_installation.py index 50b0b3567a..3725a3fc40 100644 --- a/packages/taucmdr/cf/software/binutils_installation.py +++ b/packages/taucmdr/cf/software/binutils_installation.py @@ -45,8 +45,15 @@ LOGGER = logger.get_logger(__name__) -REPOS = {None: ['http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.gz', - 'http://fs.paratools.com/tau-mirror/binutils-2.27.tar.gz']} +VERSION = '2.27' + +REPOS = {None: ['http://ftp.gnu.org/gnu/binutils/binutils-'+VERSION+'.tar.gz', + 'https://mirrors.kernel.org/gnu/binutils/binutils-'+VERSION+'.tar.gz', + 'http://mirror.rit.edu/gnu/binutils/binutils-'+VERSION+'.tar.gz', + 'https://mirror.cyberbits.eu/gnu/binutils/binutils-'+VERSION+'.tar.gz', + 'http://mirror.ufs.ac.za/gnu/binutils/binutils-'+VERSION+'.tar.gz', + 'https://ftp.jaist.ac.jp/pub/GNU/binutils/binutils-'+VERSION+'.tar.gz', + 'http://fs.paratools.com/tau-mirror/binutils-'+VERSION+'.tar.gz']} LIBRARIES = {None: ['libbfd.a']} From 987c78939c23b8c222024124768bbaba558461e6 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Mon, 21 Sep 2020 15:46:42 -0400 Subject: [PATCH 2/4] Fix docstring typo --- packages/taucmdr/cf/software/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taucmdr/cf/software/installation.py b/packages/taucmdr/cf/software/installation.py index 81db399c05..c1d9fb63b3 100644 --- a/packages/taucmdr/cf/software/installation.py +++ b/packages/taucmdr/cf/software/installation.py @@ -424,7 +424,7 @@ def verify(self): Subclasses may wish to perform additional checks. Raises: - SoftwarePackageError: Describs why the installation is invalid. + SoftwarePackageError: Describes why the installation is invalid. """ LOGGER.debug("Verifying %s installation at '%s'", self.title, self.install_prefix) if not os.path.exists(self.install_prefix): From 397ca5dcec3112b8fb8e773cf641ed76aa3ea847 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Mon, 21 Sep 2020 15:46:58 -0400 Subject: [PATCH 3/4] Implement some crude tau_installation tests --- .../software/tests/test_tau_installation.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/taucmdr/cf/software/tests/test_tau_installation.py b/packages/taucmdr/cf/software/tests/test_tau_installation.py index 750b6ad59c..34d45626eb 100644 --- a/packages/taucmdr/cf/software/tests/test_tau_installation.py +++ b/packages/taucmdr/cf/software/tests/test_tau_installation.py @@ -31,8 +31,22 @@ """ -from taucmdr.tests import TestCase, not_implemented +from taucmdr.tests import TestCase +from taucmdr.model.project import Project + -@not_implemented class TauInstallationTest(TestCase): - pass + """Unit tests for TauInstallation.""" + + def _get_tau_installation(self): + expr = Project.selected().experiment() + return expr.populate('target').get_installation('tau') + + def test_tau_installation(self): + self.reset_project_storage() + tau = self._get_tau_installation() + tau.verify() + tau_src = tau.acquire_source() + self.assertIsNotNone(tau_src) + self.assertTrue(tau_src) + self.assertIsInstance(tau_src, str) From 8857e0b565be73445688a646fabefab09e1e9b39 Mon Sep 17 00:00:00 2001 From: Izaak Beekman Date: Mon, 21 Sep 2020 15:54:16 -0400 Subject: [PATCH 4/4] Shorten long line --- packages/taucmdr/cf/software/tau_installation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/taucmdr/cf/software/tau_installation.py b/packages/taucmdr/cf/software/tau_installation.py index b30d7d4f1f..7252f399ff 100644 --- a/packages/taucmdr/cf/software/tau_installation.py +++ b/packages/taucmdr/cf/software/tau_installation.py @@ -900,7 +900,9 @@ def find_version(): def make_install_minimal(self): cmd = ['make'] + parallel_make_flags() LOGGER.info('Compiling trace input library...') - util.create_subprocess(cmd, cwd=os.path.join(self._src_prefix, 'src/TraceInput'), stdout=False, show_progress=True) + util.create_subprocess( + cmd, cwd=os.path.join(self._src_prefix, 'src/TraceInput'), stdout=False, show_progress=True + ) cmd = ['make', '-k', 'install'] + parallel_make_flags() LOGGER.info('Compiling TAU utilities...')