From f1cdf64cd5fa4271403286271ead511989ce15a1 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 13 Mar 2013 16:24:59 +0000 Subject: One 'arch' to rule them all Define a specific set of 4 architectures that Morph supports, and only expose that value to morphologies. Since GNU triplets are very common we also expose a GNU triplet. Other morphologies should work out their configuration based on MORPH_ARCH. This commit also removes the morphlib.util.arch() function, which detected the machine Morph is running on via 'uname -m'. Morph's architecture names do not necessarily map to the output of 'uname -m' so we should not rely on it anywhere. --- morphlib/util_tests.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'morphlib/util_tests.py') diff --git a/morphlib/util_tests.py b/morphlib/util_tests.py index 4f472d4e..89fe184e 100644 --- a/morphlib/util_tests.py +++ b/morphlib/util_tests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 Codethink Limited +# Copyright (C) 2011-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,14 +19,6 @@ import unittest import morphlib -class ArchTests(unittest.TestCase): - - def test(self): - arch = morphlib.util.arch() - self.assertEqual(type(arch), str) - self.assertNotEqual(arch, '') - - class IndentTests(unittest.TestCase): def test_returns_empty_string_for_empty_string(self): -- cgit v1.2.1