Commit 7c33f99b authored by qinsoon's avatar qinsoon

no longer link libmu with test dylibs

parent 70e88f6e
Pipeline #466 passed with stages
in 55 minutes and 33 seconds
......@@ -84,15 +84,6 @@ fn link_dylib_internal (files: Vec<PathBuf>, lib: &Vec<String>, libpath: &Vec<St
cc.arg(obj.as_os_str());
}
// include mu static lib
let libmu_path = if cfg!(debug_assertions) {
"target/debug/libmu.a"
} else {
"target/release/libmu.a"
};
let libmu = get_path_under_mu(libmu_path);
cc.arg(format!("{}", libmu.to_str().unwrap()));
// output
cc.arg("-o");
cc.arg(out.as_os_str());
......
......@@ -166,6 +166,7 @@ fn mul_u128() -> VM {
vm
}
#[ignore] // this test uses runtime function, should run it as bootimage
#[test]
fn test_udiv_u128() {
let lib = testutil::compile_fnc("udiv_u128", &udiv_u128);
......
......@@ -1405,7 +1405,7 @@ def test_float():
assert res.returncode == 0, res.err
assert res.out == '(0.893876, 1.000000, 0.447179)\n'
@pytest.mark.skip(reason='taking too long')
@pytest.mark.skipif(True, reason='taking too long')
@may_spawn_proc
def test_RPySOM():
from som.vm.universe import main, Exit
......
......@@ -46,11 +46,10 @@ def compile_c_script(c_src_name):
CFLAGS = [
"-std=c11",
"-I%(proj_dir)s/src/vm/api" % globals(),
"-lpthread",
"-ldl",
"-lm"
"-L" + libmu_path.dirname,
"-lmu"
]
cmd = [CC] + CFLAGS + ['-o', bin_path.strpath] + [src_c.strpath] + ["%s" % proj_dir.join('target', 'debug', 'libmu.a')]
cmd = [CC] + CFLAGS + ['-o', bin_path.strpath] + [src_c.strpath]
# compile
p = subp.Popen(cmd, stdout=subp.PIPE, stderr=subp.PIPE, env=os.environ)
......
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