diff options
Diffstat (limited to 'test/packaging')
-rw-r--r-- | test/packaging/option--package-type.py | 8 | ||||
-rw-r--r-- | test/packaging/rpm/cleanup.py | 7 | ||||
-rw-r--r-- | test/packaging/rpm/internationalization.py | 7 | ||||
-rw-r--r-- | test/packaging/rpm/multipackage.py | 7 | ||||
-rw-r--r-- | test/packaging/rpm/package.py | 7 | ||||
-rw-r--r-- | test/packaging/rpm/tagging.py | 7 |
6 files changed, 43 insertions, 0 deletions
diff --git a/test/packaging/option--package-type.py b/test/packaging/option--package-type.py index c1d6720..9bfa565 100644 --- a/test/packaging/option--package-type.py +++ b/test/packaging/option--package-type.py @@ -31,6 +31,14 @@ Test the --package-type option. import TestSCons machine = TestSCons.machine +try: + # Try to get the actual machine type (like i586), since + # TestSCons maps all ix86 types to a i386 machine internally. + import os + machine = os.uname()[4] +except AttributeError: + pass + _python_ = TestSCons._python_ test = TestSCons.TestSCons() diff --git a/test/packaging/rpm/cleanup.py b/test/packaging/rpm/cleanup.py index 7ae5473..9d79219 100644 --- a/test/packaging/rpm/cleanup.py +++ b/test/packaging/rpm/cleanup.py @@ -31,6 +31,13 @@ Assert that files created by the RPM packager will be removed by 'scons -c'. import TestSCons machine = TestSCons.machine +try: + # Try to get the actual machine type (like i586), since + # TestSCons maps all ix86 types to a i386 machine internally. + import os + machine = os.uname()[4] +except AttributeError: + pass _python_ = TestSCons._python_ test = TestSCons.TestSCons() diff --git a/test/packaging/rpm/internationalization.py b/test/packaging/rpm/internationalization.py index e9fcc12..a9bd926 100644 --- a/test/packaging/rpm/internationalization.py +++ b/test/packaging/rpm/internationalization.py @@ -36,6 +36,13 @@ import os import TestSCons machine = TestSCons.machine +try: + # Try to get the actual machine type (like i586), since + # TestSCons maps all ix86 types to a i386 machine internally. + import os + machine = os.uname()[4] +except AttributeError: + pass _python_ = TestSCons._python_ test = TestSCons.TestSCons() diff --git a/test/packaging/rpm/multipackage.py b/test/packaging/rpm/multipackage.py index c3f1f4e..4f10a8a 100644 --- a/test/packaging/rpm/multipackage.py +++ b/test/packaging/rpm/multipackage.py @@ -33,6 +33,13 @@ import os import TestSCons machine = TestSCons.machine +try: + # Try to get the actual machine type (like i586), since + # TestSCons maps all ix86 types to a i386 machine internally. + import os + machine = os.uname()[4] +except AttributeError: + pass _python_ = TestSCons._python_ test = TestSCons.TestSCons() diff --git a/test/packaging/rpm/package.py b/test/packaging/rpm/package.py index 14da4bb..3a55e33 100644 --- a/test/packaging/rpm/package.py +++ b/test/packaging/rpm/package.py @@ -32,6 +32,13 @@ import os import TestSCons machine = TestSCons.machine +try: + # Try to get the actual machine type (like i586), since + # TestSCons maps all ix86 types to a i386 machine internally. + import os + machine = os.uname()[4] +except AttributeError: + pass _python_ = TestSCons._python_ test = TestSCons.TestSCons() diff --git a/test/packaging/rpm/tagging.py b/test/packaging/rpm/tagging.py index 6a242c6..4e43d93 100644 --- a/test/packaging/rpm/tagging.py +++ b/test/packaging/rpm/tagging.py @@ -33,6 +33,13 @@ import os import TestSCons machine = TestSCons.machine +try: + # Try to get the actual machine type (like i586), since + # TestSCons maps all ix86 types to a i386 machine internally. + import os + machine = os.uname()[4] +except AttributeError: + pass _python_ = TestSCons._python_ test = TestSCons.TestSCons() |