From 45cd7678718f6d19971d80eb16d5898999ad2ff9 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Fri, 11 Apr 2003 06:31:14 +0000 Subject: [PATCH] Fix a bug introduces in 1.8 which broke gcc tests. Do not think that import libraries are used with gcc, even on NT. The previos version assumed that import libraries are always used on NT. [SVN r18230] --- test/searched_lib.py | 2 +- v2/test/searched_lib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/searched_lib.py b/test/searched_lib.py index d1784567f..8cc2eccb3 100644 --- a/test/searched_lib.py +++ b/test/searched_lib.py @@ -24,7 +24,7 @@ t.expect_addition("lib/bin/$toolset/debug/test_lib.dll") # Auto adjusting of suffixes does not work, since we need to # change dll to lib. # -if os.name == 'nt' or ( os.uname()[0].lower().startswith('cygwin') and get_toolset() != 'gcc') : +if (os.name == 'nt' or os.uname()[0].lower().startswith('cygwin')) and get_toolset() != 'gcc': t.copy("lib/bin/$toolset/debug/test_lib.lib", "lib/test_lib.lib") else: t.copy("lib/bin/$toolset/debug/test_lib.dll", "lib/libtest_lib.dll") diff --git a/v2/test/searched_lib.py b/v2/test/searched_lib.py index d1784567f..8cc2eccb3 100644 --- a/v2/test/searched_lib.py +++ b/v2/test/searched_lib.py @@ -24,7 +24,7 @@ t.expect_addition("lib/bin/$toolset/debug/test_lib.dll") # Auto adjusting of suffixes does not work, since we need to # change dll to lib. # -if os.name == 'nt' or ( os.uname()[0].lower().startswith('cygwin') and get_toolset() != 'gcc') : +if (os.name == 'nt' or os.uname()[0].lower().startswith('cygwin')) and get_toolset() != 'gcc': t.copy("lib/bin/$toolset/debug/test_lib.lib", "lib/test_lib.lib") else: t.copy("lib/bin/$toolset/debug/test_lib.dll", "lib/libtest_lib.dll")