summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-08-17 23:14:59 (GMT)
committerSteven Knight <knight@baldmt.com>2004-08-17 23:14:59 (GMT)
commite18d45e027a965547bbb698c0e6784254298f8b1 (patch)
tree3be53d9c53f1a263095130e39e07328bcae51f2b /etc
parent401c24879c1dcd9e28df19b3ee2384b26df583ee (diff)
downloadSCons-e18d45e027a965547bbb698c0e6784254298f8b1.zip
SCons-e18d45e027a965547bbb698c0e6784254298f8b1.tar.gz
SCons-e18d45e027a965547bbb698c0e6784254298f8b1.tar.bz2
Portability fixes for Mac OS Xin tests. (Gary Oberbrunner)
Diffstat (limited to 'etc')
-rw-r--r--etc/TestCommon.py12
-rw-r--r--etc/TestSCons.py2
2 files changed, 11 insertions, 3 deletions
diff --git a/etc/TestCommon.py b/etc/TestCommon.py
index c7ee6f9..43cfddd 100644
--- a/etc/TestCommon.py
+++ b/etc/TestCommon.py
@@ -76,8 +76,8 @@ The TestCommon module also provides the following variables
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
__author__ = "Steven Knight <knight at baldmt dot com>"
-__revision__ = "TestCommon.py 0.9.D001 2004/08/06 08:19:26 knight"
-__version__ = "0.9"
+__revision__ = "TestCommon.py 0.10.D001 2004/08/17 17:39:41 knight"
+__version__ = "0.10"
import os
import os.path
@@ -124,6 +124,14 @@ elif string.find(sys.platform, 'irix') != -1:
lib_suffix = '.a'
dll_prefix = 'lib'
dll_suffix = '.so'
+elif string.find(sys.platform, 'darwin') != -1:
+ exe_suffix = ''
+ obj_suffix = '.o'
+ shobj_suffix = '.os'
+ lib_prefix = 'lib'
+ lib_suffix = '.a'
+ dll_prefix = 'lib'
+ dll_suffix = '.dylib'
else:
exe_suffix = ''
obj_suffix = '.o'
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index 202f5d5..0a5469b 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -217,4 +217,4 @@ class TestSCons(TestCommon):
# <file>" messages to be successful executions of the test (see
# test/AR.py for sample usage).
-noisy_ar=r'(ar: creating \S+\n?)*'
+noisy_ar=r'(ar: creating( archive)? \S+\n?)*'