diff --git a/.vscode/launch.json b/.vscode/launch.json index 09074c56b..4255c8029 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -100,6 +100,20 @@ "cwd": "${workspaceFolder}", "environment": [], }, + { + "name": "(Windows) Launch JIT", + "type": "cppvsdbg", + "request": "launch", + "program": "${workspaceFolder}/target/debug/plc.exe", + "args": ["run", "out.ll"], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "symbolSearchPath": "${workspaceFolder}\\target\\debug", + "environment": [{"name" : "PATH", "value" : "${workspaceFolder}\\target\\debug;${env:PATH}"},{ + "name": "PL_ROOT", + "value": "${workspaceFolder}\\target\\debug" + }], + }, { "name": "(Windows) 附加", "type": "cppvsdbg", diff --git a/Makefile b/Makefile index 5fff59d8a..349ffad3c 100644 --- a/Makefile +++ b/Makefile @@ -57,3 +57,6 @@ mdbook-install: @cargo install mdbook-linkcheck @cargo install mdbook-toc +init-submodules: + @git submodule update --init --recursive + diff --git a/immix b/immix index 3b4b2a165..722c1667d 160000 --- a/immix +++ b/immix @@ -1 +1 @@ -Subproject commit 3b4b2a165490a80279525218c33051b082a9db72 +Subproject commit 722c1667dd5206e29d59e507ccd7d6e0cbc089af diff --git a/src/ast/test.rs b/src/ast/test.rs index b3fd22c89..a18dd52d7 100644 --- a/src/ast/test.rs +++ b/src/ast/test.rs @@ -408,9 +408,11 @@ fn test_doc_symbol() { ); } +// FIXME: IDK why but win will fail the test(invalid memory access) +// after Rust print out test succ.. +// Can't reproduce on my local machine #[test] -#[ignore] -#[cfg(feature = "jit")] +#[cfg(all(feature = "jit", not(windows)))] fn test_orc_jit() { use crate::ast::compiler::{compile, Options}; use std::path::PathBuf; diff --git a/src/repl/test.rs b/src/repl/test.rs index ba049eb61..9069b5cc7 100644 --- a/src/repl/test.rs +++ b/src/repl/test.rs @@ -5,6 +5,7 @@ struct TestEditor { err_expects: VecDeque, } +#[cfg(target_os = "linux")] impl TestEditor { fn new(input: VecDeque, err_expects: VecDeque) -> Self { Self { input, err_expects } @@ -57,8 +58,8 @@ impl super::editor::TermEditor for TestEditor { } } -#[ignore] #[test] +#[cfg(all(test, target_os = "linux"))] fn test_repl() { let rl = TestEditor::new( VecDeque::from(vec![ @@ -81,7 +82,7 @@ fn test_repl() { "@repl symbol".to_owned(), ]), VecDeque::from(vec![ - false, false, true, true, false, false, false, false, false, false, false, false, + false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, ]), );