From 09172cd7b265174703131c9945fc18315cc1bc82 Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Sat, 17 Aug 2013 20:52:11 -0700 Subject: Fix VersionedLib test Adjust for Cygwin coding conventions and test for existence of the import libraries. --- QMTest/TestCommon.py | 2 +- test/LINK/VersionedLib.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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 = [ -- cgit v0.12