Commit 5a1596ad authored by John Zhang's avatar John Zhang

set eci in platform.execute so to eliminate the need for setting (DY)LD_LIBRARY_PATH

parent 2c5ff1c7
...@@ -103,7 +103,7 @@ testjit:rpython: ...@@ -103,7 +103,7 @@ testjit:rpython:
- git checkout mu-rewrite-zebu-no-binop-with-flag - git checkout mu-rewrite-zebu-no-binop-with-flag
- git apply pypy.patch - git apply pypy.patch
- cd $CI_PROJECT_DIR/tests/test_jit - cd $CI_PROJECT_DIR/tests/test_jit
- RUST_BACKTRACE=1 LD_LIBRARY_PATH=. PYTHONPATH=mu-client-pypy MU_ZEBU=$CI_PROJECT_DIR pytest test_rpython*.py -v - RUST_BACKTRACE=1 PYTHONPATH=mu-client-pypy MU_ZEBU=$CI_PROJECT_DIR pytest test_rpython*.py -v
cache: cache:
key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME" key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
paths: paths:
......
...@@ -998,12 +998,13 @@ def run_boot_image(entry, output, has_c_main_sig = False, args = []): ...@@ -998,12 +998,13 @@ def run_boot_image(entry, output, has_c_main_sig = False, args = []):
t.driver.standalone = True # force standalone t.driver.standalone = True # force standalone
t.driver.exe_name = output t.driver.exe_name = output
t.compile_mu() db, mugen, epf_name = t.compile_mu()
exe = py.path.local(output + '.mu') exe = py.path.local(output)
# zebu # zebu
exe.chmod(stat.S_IRWXU) exe.chmod(stat.S_IRWXU)
res = platform.execute(str(exe), args) eci = rffi.ExternalCompilationInfo(library_dirs=[str(db.libsupport_path.dirpath())])
res = platform.execute(str(exe), args, compilation_info=eci)
return res return res
......
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