summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/engine/SCons/ActionTests.py4
-rw-r--r--src/engine/SCons/Tool/MSCommon/vc.py9
-rw-r--r--test/Clang/clang_shared_library.py2
-rw-r--r--test/Clang/clangxx_shared_library.py3
-rw-r--r--test/Errors/execute-a-directory.py6
-rw-r--r--test/Errors/non-executable-file.py6
-rw-r--r--test/LINK/VersionedLib.py12
-rw-r--r--test/SWIG/recursive-includes-cpp.py2
-rw-r--r--testing/framework/TestCommon.py4
9 files changed, 24 insertions, 24 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py
index 3054368..3303750 100644
--- a/src/engine/SCons/ActionTests.py
+++ b/src/engine/SCons/ActionTests.py
@@ -1208,10 +1208,6 @@ class CommandActionTestCase(unittest.TestCase):
# Newer cygwin seems to return 126 for following
expect_nonexecutable_file = 126
expect_nonexecutable_dir = 127
- elif sys.platform.find('sunos') != -1:
- expect_nonexistent = 1
- expect_nonexecutable_file = 1
- expect_nonexecutable_dir = 1
else:
expect_nonexistent = 127
expect_nonexecutable_file = 126
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 4f6048d..86bdbe0 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -161,11 +161,18 @@ def get_host_target(env):
if not host_platform:
host_platform = platform.machine()
+ # Solaris returns i86pc for both 32 and 64 bit architectures
+ if host_platform == "i86pc":
+ if platform.architecture()[0] == "64bit":
+ host_platform = "amd64"
+ else:
+ host_platform = "x86"
+
# Retain user requested TARGET_ARCH
req_target_platform = env.get('TARGET_ARCH')
debug('get_host_target() req_target_platform:%s'%req_target_platform)
- if req_target_platform:
+ if req_target_platform:
# If user requested a specific platform then only try that one.
target_platform = req_target_platform
else:
diff --git a/test/Clang/clang_shared_library.py b/test/Clang/clang_shared_library.py
index 9af3770..83fa4dd 100644
--- a/test/Clang/clang_shared_library.py
+++ b/test/Clang/clang_shared_library.py
@@ -35,7 +35,7 @@ if not test.where_is('clang'):
base = Base()
platform = base['PLATFORM']
-if platform == 'posix':
+if platform in ['posix', 'sunos']:
filename_options = ['foo.os']
libraryname = 'libfoo.so'
elif platform == 'darwin':
diff --git a/test/Clang/clangxx_shared_library.py b/test/Clang/clangxx_shared_library.py
index 6240299..a16be6b 100644
--- a/test/Clang/clangxx_shared_library.py
+++ b/test/Clang/clangxx_shared_library.py
@@ -44,6 +44,9 @@ elif platform == 'darwin':
elif platform == 'win32':
filename_options = ['foo.obj','foo.os']
libraryname = 'foo.dll'
+elif platform == 'sunos':
+ filename_options = ['foo.pic.o']
+ libraryname = 'libfoo.so'
else:
test.fail_test()
diff --git a/test/Errors/execute-a-directory.py b/test/Errors/execute-a-directory.py
index 95fa7b6..8b6d13b 100644
--- a/test/Errors/execute-a-directory.py
+++ b/test/Errors/execute-a-directory.py
@@ -65,7 +65,7 @@ scons: \\*\\*\\* \\[%s\\] Error 1
"""
cannot_execute = """\
-(sh: )*.+: cannot execute
+(sh: )*.+: cannot execute( \\[Is a directory\\])?
scons: \\*\\*\\* \\[%s\\] Error %s
"""
@@ -93,10 +93,6 @@ if os.name == 'nt':
konnte_nicht_gefunden_werden % ('f3', 1),
unspecified % 'f3'
]
-elif sys.platform.find('sunos') != -1:
- errs = [
- cannot_execute % ('f3', 1),
- ]
else:
errs = [
cannot_execute % ('f3', 126),
diff --git a/test/Errors/non-executable-file.py b/test/Errors/non-executable-file.py
index 0e00c77..64c75c6 100644
--- a/test/Errors/non-executable-file.py
+++ b/test/Errors/non-executable-file.py
@@ -54,7 +54,7 @@ scons: \\*\\*\\* \\[%s\\] Error 1
"""
cannot_execute = """\
-(sh: )*.+: cannot execute
+(sh: )*.+: cannot execute( \\[Permission denied\\])?
scons: \\*\\*\\* \\[%s\\] Error %s
"""
@@ -88,10 +88,6 @@ if os.name == 'nt':
konnte_nicht_gefunden_werden % ('f1', 1),
unspecified % 'f1'
]
-elif sys.platform.find('sunos') != -1:
- errs = [
- cannot_execute % ('f1', 1),
- ]
else:
errs = [
cannot_execute % ('f1', 126),
diff --git a/test/LINK/VersionedLib.py b/test/LINK/VersionedLib.py
index 468e3e5..64f9b90 100644
--- a/test/LINK/VersionedLib.py
+++ b/test/LINK/VersionedLib.py
@@ -138,37 +138,37 @@ elif 'sunlink' in tool_list:
test_plan = [
{
'libversion' : '2',
- 'files' : [ 'libtest.so', 'libtest.so.2', 'so_test.os' ],
+ 'files' : [ 'libtest.so', 'libtest.so.2', 'test.pic.o' ],
'instfiles' : [ 'libtest.so', 'libtest.so.2' ],
'symlinks' : [ ('libtest.so', 'libtest.so.2') ],
},
{
'libversion' : '2.5',
- 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5', 'so_test.os' ],
+ 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5', 'test.pic.o' ],
'instfiles' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5' ],
'symlinks' : [ ('libtest.so', 'libtest.so.2.5'), ('libtest.so.2', 'libtest.so.2.5') ],
},
{
'libversion' : '2.5.4',
- 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4', 'so_test.os' ],
+ 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4', 'test.pic.o' ],
'instfiles' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4' ],
'symlinks' : [ ('libtest.so', 'libtest.so.2.5.4'), ('libtest.so.2', 'libtest.so.2.5.4') ],
},
{
'libversion' : '2.5.4.7.8',
- 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8', 'so_test.os' ],
+ 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8', 'test.pic.o' ],
'instfiles' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.5.4.7.8' ],
'symlinks' : [ ('libtest.so', 'libtest.so.2.5.4.7.8'), ('libtest.so.2', 'libtest.so.2.5.4.7.8') ],
},
{
'libversion' : 'aabf114f',
- 'files' : [ 'libtest.so', 'libtest.so.aabf114f', 'so_test.os' ],
+ 'files' : [ 'libtest.so', 'libtest.so.aabf114f', 'test.pic.o' ],
'instfiles' : [ 'libtest.so', 'libtest.so.aabf114f' ],
'symlinks' : [ ('libtest.so', 'libtest.so.aabf114f') ],
},
{
'libversion' : '2.dfffa11',
- 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11', 'so_test.os' ],
+ 'files' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11', 'test.pic.o' ],
'instfiles' : [ 'libtest.so', 'libtest.so.2', 'libtest.so.2.dfffa11' ],
'symlinks' : [ ('libtest.so', 'libtest.so.2.dfffa11'), ('libtest.so.2', 'libtest.so.2.dfffa11') ],
},
diff --git a/test/SWIG/recursive-includes-cpp.py b/test/SWIG/recursive-includes-cpp.py
index 3999cc3..dcd9d05 100644
--- a/test/SWIG/recursive-includes-cpp.py
+++ b/test/SWIG/recursive-includes-cpp.py
@@ -115,6 +115,8 @@ env.SharedLibrary(
if sys.platform == 'win32':
object_suffix = ".obj"
+elif sys.platform == 'sunos5':
+ object_suffix = ".pic.o"
else:
object_suffix = ".os"
diff --git a/testing/framework/TestCommon.py b/testing/framework/TestCommon.py
index ca4a147..8e6cc8e 100644
--- a/testing/framework/TestCommon.py
+++ b/testing/framework/TestCommon.py
@@ -165,8 +165,8 @@ elif sys.platform.find('darwin') != -1:
elif sys.platform.find('sunos') != -1:
exe_suffix = ''
obj_suffix = '.o'
- shobj_suffix = '.o'
- shobj_prefix = 'so_'
+ shobj_suffix = '.pic.o'
+ shobj_prefix = ''
lib_prefix = 'lib'
lib_suffix = '.a'
dll_prefix = 'lib'
generated by cgit v0.12 at 2024-11-24 23:46:15 (GMT)