another embed test fix for Python 2.4

diff --git a/runtests.py b/runtests.py
index bc407ca17aec2a8c1e64e1d2579621ea0b36b2ef..d4d7d323bb297b6d29f091833c06efd63f8e1ddf 100644 (file)
--- a/runtests.py
+++ b/runtests.py
@@ -646,9 +646,15 @@ class EmbedTest(unittest.TestCase):
         
     def test_embed(self):
         from distutils import sysconfig
+        libname = sysconfig.get_config_var('LIBRARY')
         libdir = sysconfig.get_config_var('LIBDIR')
-        if not os.path.isdir(libdir):
-            libdir = os.path.join(os.path.dirname(sys.executable), '../lib')
+        if not os.path.isdir(libdir) or libname not in os.listdir(libdir):
+            libdir = os.path.join(os.path.dirname(sys.executable), '..', 'lib')
+            if not os.path.isdir(libdir) or libname not in os.listdir(libdir):
+                libdir = os.path.join(libdir, 'python%d.%d' % sys.version_info[:2], 'config')
+                if not os.path.isdir(libdir) or libname not in os.listdir(libdir):
+                    # report the error for the original directory
+                    libdir = sysconfig.get_config_var('LIBDIR')
         self.assert_(os.system(
             "make PYTHON='%s' LIBDIR1='%s' test > make.output" % (sys.executable, libdir)) == 0)
         try: