diff options
author | Steven Knight <knight@baldmt.com> | 2002-04-16 03:24:39 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2002-04-16 03:24:39 (GMT) |
commit | bbdad76b308f2bc3a38da616ab8333e469c558c6 (patch) | |
tree | 65167c0d078ee5691a5db404ede041b16387d021 /test | |
parent | 1697d4399e8342fd3d2dbe02a67e03b4d2f835f0 (diff) | |
download | SCons-bbdad76b308f2bc3a38da616ab8333e469c558c6.zip SCons-bbdad76b308f2bc3a38da616ab8333e469c558c6.tar.gz SCons-bbdad76b308f2bc3a38da616ab8333e469c558c6.tar.bz2 |
Shared library test fixes. (Charles Crain)
Diffstat (limited to 'test')
-rw-r--r-- | test/SHCXX.py | 8 | ||||
-rw-r--r-- | test/SHCXXFLAGS.py | 10 | ||||
-rw-r--r-- | test/SHLINK.py | 37 | ||||
-rw-r--r-- | test/SHLINKFLAGS.py | 40 | ||||
-rw-r--r-- | test/SharedLibrary.py | 2 |
5 files changed, 51 insertions, 46 deletions
diff --git a/test/SHCXX.py b/test/SHCXX.py index 0c3e2f2..5825491 100644 --- a/test/SHCXX.py +++ b/test/SHCXX.py @@ -50,11 +50,11 @@ test.write('SConstruct', """ foo = Environment() shcxx = foo.Dictionary('SHCXX') bar = Environment(SHCXX = r'%s wrapper.py ' + shcxx) -foo.Program(target = 'foo', source = 'foo.cc', shared = 1) -bar.Program(target = 'bar', source = 'bar.cc', shared = 1) +foo.Program(target = 'foo', source = 'foo.cpp', shared = 1) +bar.Program(target = 'bar', source = 'bar.cpp', shared = 1) """ % python) -test.write('foo.cc', r""" +test.write('foo.cpp', r""" #include <stdio.h> #include <stdlib.h> int @@ -66,7 +66,7 @@ main(int argc, char *argv[]) } """) -test.write('bar.cc', r""" +test.write('bar.cpp', r""" #include <stdio.h> #include <stdlib.h> int diff --git a/test/SHCXXFLAGS.py b/test/SHCXXFLAGS.py index af980fe..5623795 100644 --- a/test/SHCXXFLAGS.py +++ b/test/SHCXXFLAGS.py @@ -42,13 +42,13 @@ test = TestSCons.TestSCons() test.write('SConstruct', """ foo = Environment(SHCXXFLAGS = '%s') bar = Environment(SHCXXFLAGS = '%s') -foo.Object(target = 'foo%s', source = 'prog.cc', shared = 1) -bar.Object(target = 'bar%s', source = 'prog.cc', shared = 1) +foo.Object(target = 'foo%s', source = 'prog.cpp', shared = 1) +bar.Object(target = 'bar%s', source = 'prog.cpp', shared = 1) foo.Program(target = 'foo', source = 'foo%s', shared = 1) bar.Program(target = 'bar', source = 'bar%s', shared = 1) """ % (fooflags, barflags, _obj, _obj, _obj, _obj)) -test.write('prog.cc', r""" +test.write('prog.cpp', r""" #include <stdio.h> #include <stdlib.h> int @@ -73,8 +73,8 @@ test.run(program = test.workpath('bar'), stdout = "prog.c: BAR\n") test.write('SConstruct', """ bar = Environment(SHCXXFLAGS = '%s') -bar.Object(target = 'foo%s', source = 'prog.cc', shared = 1) -bar.Object(target = 'bar%s', source = 'prog.cc', shared = 1) +bar.Object(target = 'foo%s', source = 'prog.cpp', shared = 1) +bar.Object(target = 'bar%s', source = 'prog.cpp', shared = 1) bar.Program(target = 'foo', source = 'foo%s', shared = 1) bar.Program(target = 'bar', source = 'bar%s', shared = 1) """ % (barflags, _obj, _obj, _obj, _obj)) diff --git a/test/SHLINK.py b/test/SHLINK.py index 61060ee..4d28e04 100644 --- a/test/SHLINK.py +++ b/test/SHLINK.py @@ -32,14 +32,14 @@ import TestSCons python = sys.executable if sys.platform == 'win32': - _exe = '.exe' + lib_ = '' + _shlib='.dll' else: - _exe = '' - + lib_ = 'lib' + _shlib='.so' + test = TestSCons.TestSCons() -test.pass_test() #XXX Until someone can take a look and fix this. - test.write("wrapper.py", """import os import string @@ -52,36 +52,37 @@ test.write('SConstruct', """ foo = Environment() shlink = foo.Dictionary('SHLINK') bar = Environment(SHLINK = r'%s wrapper.py ' + shlink) -foo.Program(target = 'foo', source = 'foo.c', shared = 1) -bar.Program(target = 'bar', source = 'bar.c', shared = 1) +foo.Library(target = 'foo', source = 'foo.c', shared = 1) +bar.Library(target = 'bar', source = 'bar.c', shared = 1) """ % python) test.write('foo.c', r""" -int -main(int argc, char *argv[]) +#include <stdio.h> + +void +test() { - argv[argc++] = "--"; printf("foo.c\n"); - exit (0); + fflush(stdout); } """) test.write('bar.c', r""" -int -main(int argc, char *argv[]) +#include <stdio.h> + +void +test() { - argv[argc++] = "--"; printf("foo.c\n"); - exit (0); + fflush(stdout); } """) - -test.run(arguments = 'foo' + _exe) +test.run(arguments = lib_ + 'foo' + _shlib) test.fail_test(os.path.exists(test.workpath('wrapper.out'))) -test.run(arguments = 'bar' + _exe) +test.run(arguments = lib_ + 'bar' + _shlib) test.fail_test(test.read('wrapper.out') != "wrapper.py\n") diff --git a/test/SHLINKFLAGS.py b/test/SHLINKFLAGS.py index a885d84..6494ad5 100644 --- a/test/SHLINKFLAGS.py +++ b/test/SHLINKFLAGS.py @@ -32,14 +32,14 @@ import TestSCons python = sys.executable if sys.platform == 'win32': - _exe = '.exe' + lib_ = '' + _shlib = '.dll' else: - _exe = '' + lib_ = 'lib' + _shlib = '.so' test = TestSCons.TestSCons() -test.pass_test() #XXX Until someone can take a look and fix this. - test.write("wrapper.py", """import os import string @@ -51,38 +51,42 @@ os.system(string.join(sys.argv[1:], " ")) test.write('SConstruct', """ foo = Environment() shlink = foo.Dictionary('SHLINK') -bar = Environment(SHLINK = '', SHLINKFLAGS = r'%s wrapper.py ' + shlink) -foo.Program(target = 'foo', source = 'foo.c', shared = 1) -bar.Program(target = 'bar', source = 'bar.c', shared = 1) +shlinkflags = foo.Dictionary('SHLINKFLAGS') +bar = Environment(SHLINK = '', + SHLINKFLAGS = r'%s wrapper.py ' + shlink + ' ' + shlinkflags) +foo.Library(target = 'foo', source = 'foo.c', shared = 1) +bar.Library(target = 'bar', source = 'bar.c', shared = 1) """ % python) test.write('foo.c', r""" -int -main(int argc, char *argv[]) +#include <stdio.h> + +void +test() { - argv[argc++] = "--"; printf("foo.c\n"); - exit (0); + fflush(stdout); } """) test.write('bar.c', r""" -int -main(int argc, char *argv[]) +#include <stdio.h> + +void +test() { - argv[argc++] = "--"; printf("foo.c\n"); - exit (0); + fflush(stdout); } """) - -test.run(arguments = 'foo' + _exe) +test.run(arguments = lib_ + 'foo' + _shlib) test.fail_test(os.path.exists(test.workpath('wrapper.out'))) -test.run(arguments = 'bar' + _exe) +test.run(arguments = lib_ + 'bar' + _shlib) test.fail_test(test.read('wrapper.out') != "wrapper.py\n") test.pass_test() + diff --git a/test/SharedLibrary.py b/test/SharedLibrary.py index 038370b..d00f595 100644 --- a/test/SharedLibrary.py +++ b/test/SharedLibrary.py @@ -30,7 +30,7 @@ import os test = TestSCons.TestSCons() test.write('SConstruct', """ -env=Environment() +env=Environment(WIN32_INSERT_DEF=1) env2 = Environment(LIBS = [ 'foo1', 'foo2', 'foo3' ], LIBPATH = [ '.' ]) env.Library(target = 'foo1', source = 'f1.c', shared=1) |