summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-08-12 11:58:49 (GMT)
committerSteven Knight <knight@baldmt.com>2005-08-12 11:58:49 (GMT)
commit62b1b28dd7e952eb3d9910feb39fde8f02dd5dfa (patch)
tree633bc514ecb582b328f0bb9a9ae0f9a8a0f8f133 /test
parent33f2e8d10b3f0334ab37ffb72bc4a282221dade6 (diff)
downloadSCons-62b1b28dd7e952eb3d9910feb39fde8f02dd5dfa.zip
SCons-62b1b28dd7e952eb3d9910feb39fde8f02dd5dfa.tar.gz
SCons-62b1b28dd7e952eb3d9910feb39fde8f02dd5dfa.tar.bz2
Add Framework support for Mac OS X. (Greg Noel) Document it. (Gary Oberbrunner)
Diffstat (limited to 'test')
-rw-r--r--test/ToolSurrogate.py2
-rw-r--r--test/gnutools.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/test/ToolSurrogate.py b/test/ToolSurrogate.py
index fa13b57..527e3d3 100644
--- a/test/ToolSurrogate.py
+++ b/test/ToolSurrogate.py
@@ -87,7 +87,7 @@ env.Program('foo.c')
test.write('foo.c', "foo.c posix\n")
test.run(arguments = '. platform=posix', stdout = test.wrap_stdout("""\
-cc -c -o foo.obj foo.c
+cc -o foo.obj -c foo.c
cc -o foo.exe foo.obj
"""))
diff --git a/test/gnutools.py b/test/gnutools.py
index d5173ee..82c83ef 100644
--- a/test/gnutools.py
+++ b/test/gnutools.py
@@ -128,16 +128,16 @@ def testObject(test, obj, command, flags):
if sys.platform == 'cygwin':
fpic = ''
else:
- fpic = '-fPIC '
+ fpic = ' -fPIC'
test.fail_test(not testObject(test, 'cfile1.o', 'gcc', '-c') or
not testObject(test, 'cfile2.o', 'gcc', '-c') or
not testObject(test, 'cppfile1.o', 'g++', '-c') or
not testObject(test, 'cppfile2.o', 'g++', '-c') or
- not testObject(test, 'cfile1.os', 'gcc', fpic + '-c') or
- not testObject(test, 'cfile2.os', 'gcc', fpic + '-c') or
- not testObject(test, 'cppfile1.os', 'g++', fpic + '-c') or
- not testObject(test, 'cppfile2.os', 'g++', fpic + '-c') or
+ not testObject(test, 'cfile1.os', 'gcc', '-c' + fpic) or
+ not testObject(test, 'cfile2.os', 'gcc', '-c' + fpic) or
+ not testObject(test, 'cppfile1.os', 'g++', '-c' + fpic) or
+ not testObject(test, 'cppfile2.os', 'g++', '-c' + fpic) or
not testObject(test, 'c-only' + _exe, 'gcc', '') or
not testObject(test, 'cpp-only' + _exe, 'g++', '') or
not testObject(test, 'c-and-cpp' + _exe, 'g++', '') or