diff options
| author | David Rothenberger <daveroth@acm.org> | 2013-08-18 03:52:11 (GMT) |
|---|---|---|
| committer | David Rothenberger <daveroth@acm.org> | 2013-08-18 03:52:11 (GMT) |
| commit | 09172cd7b265174703131c9945fc18315cc1bc82 (patch) | |
| tree | e9150de05051a4f4490efa227c836e278fc545ac | |
| parent | f837e2e6511cc8049e5a765c9af25afc9fd730fe (diff) | |
| download | SCons-09172cd7b265174703131c9945fc18315cc1bc82.zip SCons-09172cd7b265174703131c9945fc18315cc1bc82.tar.gz SCons-09172cd7b265174703131c9945fc18315cc1bc82.tar.bz2 | |
Fix VersionedLib test
Adjust for Cygwin coding conventions and test for existence of the
import libraries.
| -rw-r--r-- | QMTest/TestCommon.py | 2 | ||||
| -rw-r--r-- | test/LINK/VersionedLib.py | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/QMTest/TestCommon.py b/QMTest/TestCommon.py index 6eeda5e..4e90e16 100644 --- a/QMTest/TestCommon.py +++ b/QMTest/TestCommon.py @@ -163,7 +163,7 @@ elif sys.platform == 'cygwin': shobj_prefix = '' lib_prefix = 'lib' lib_suffix = '.a' - dll_prefix = '' + dll_prefix = 'cyg' dll_suffix = '.dll' elif sys.platform.find('irix') != -1: exe_suffix = '' diff --git a/test/LINK/VersionedLib.py b/test/LINK/VersionedLib.py index 0d45789..3c92252 100644 --- a/test/LINK/VersionedLib.py +++ b/test/LINK/VersionedLib.py @@ -98,6 +98,18 @@ elif platform == 'darwin': 'libtest.dylib',
'libtest.2.5.4.dylib',
]
+elif platform == 'cygwin':
+ # All (?) the files we expect will get created in the current directory
+ files = [
+ 'cygtest-2-5-4.dll',
+ 'libtest-2-5-4.dll.a',
+ 'test.os',
+ ]
+ # All (?) the files we expect will get created in the 'installtest' directory
+ instfiles = [
+ 'cygtest-2-5-4.dll',
+ 'libtest-2-5-4.dll.a',
+ ]
elif platform == 'win32':
# All (?) the files we expect will get created in the current directory
files = [
|