summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rothenberger <daveroth@acm.org>2013-08-18 03:54:14 (GMT)
committerDavid Rothenberger <daveroth@acm.org>2013-08-18 03:54:14 (GMT)
commitdc219f6fbf579c9ac9aecc5b3ea76dcc327a948c (patch)
treec9893b6e51ad19d2d13b81bd365a229713abdb16
parent09172cd7b265174703131c9945fc18315cc1bc82 (diff)
downloadSCons-dc219f6fbf579c9ac9aecc5b3ea76dcc327a948c.zip
SCons-dc219f6fbf579c9ac9aecc5b3ea76dcc327a948c.tar.gz
SCons-dc219f6fbf579c9ac9aecc5b3ea76dcc327a948c.tar.bz2
Fix Libs/SharedLibrary.py
Check for files using Cygwin naming conventions.
-rw-r--r--test/Libs/SharedLibrary.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index 18d1f24..b7d1374 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -44,7 +44,7 @@ else:
SharedLibrary(target = 'foo2',
source = Split('f2a.c f2b.c f2c.c'),
WINDOWS_INSERT_DEF = 1)
-env.SharedLibrary(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'])
+env.SharedLibrary(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'], no_import_lib = 1)
env2.Program(target = 'prog', source = 'prog.c')
""")
@@ -207,6 +207,13 @@ if sys.platform.find('irix') != -1:
test.run(program = test.workpath('prog'),
stdout = "f1.c\nf2a.c\nf2b.c\nf2c.c\nf3a.c\nf3b.c\nf3c.c\nprog.c\n")
+if sys.platform == 'cygwin':
+ # Cygwin: Make sure the DLLs are prefixed correctly.
+ test.must_exist('cygfoo1.dll', 'cygfoo2.dll', 'cygfoo3.dll')
+ test.must_exist('libfoo1.dll.a', 'libfoo2.dll.a')
+ test.must_not_exist('foo3.dll.a')
+
+
if sys.platform == 'win32' or sys.platform.find('irix') != -1:
test.run(arguments = '-f SConstructFoo')
else: