Commit 1422b74f authored by Stefan Behnel's avatar Stefan Behnel

retry by moving stupidly misplaced fix

parent 2302a576
...@@ -633,12 +633,8 @@ class EmbedTest(unittest.TestCase): ...@@ -633,12 +633,8 @@ class EmbedTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.old_dir = os.getcwd() self.old_dir = os.getcwd()
os.chdir(self.working_dir) os.chdir(self.working_dir)
from distutils import sysconfig
libdir = sysconfig.get_config_var('LIBDIR')
if not os.path.isdir(libdir):
libdir = os.path.join(os.path.dirname(sys.executable), '../lib')
os.system( os.system(
"make PYTHON='%s' LIBDIR1='%s' clean > /dev/null" % (sys.executable, libdir)) "make PYTHON='%s' clean > /dev/null" % sys.executable)
def tearDown(self): def tearDown(self):
try: try:
...@@ -649,8 +645,12 @@ class EmbedTest(unittest.TestCase): ...@@ -649,8 +645,12 @@ class EmbedTest(unittest.TestCase):
os.chdir(self.old_dir) os.chdir(self.old_dir)
def test_embed(self): def test_embed(self):
from distutils import sysconfig
libdir = sysconfig.get_config_var('LIBDIR')
if not os.path.isdir(libdir):
libdir = os.path.join(os.path.dirname(sys.executable), '../lib')
self.assert_(os.system( self.assert_(os.system(
"make PYTHON='%s' test > make.output" % sys.executable) == 0) "make PYTHON='%s' LIBDIR1='%s' test > make.output" % (sys.executable, libdir)) == 0)
try: try:
os.remove('make.output') os.remove('make.output')
except OSError: except OSError:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment