Skip to content

Commit

Permalink
add kclvm path in ci for ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
zong-zhe committed Jul 4, 2022
1 parent c589e87 commit 1a3729e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
components: clippy, rustfmt
- name: Rust unit test
working-directory: ./kclvm
run: make codecov-lcov
run: export PATH=$PATH:$(PWD)/_build/dist/ubuntu/kclvm/bin/ && make && make codecov-lcov
shell: bash
- name: Coveralls upload
uses: coverallsapp/github-action@master
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROJECT_NAME = KCLVM
PWD:=$(shell pwd)

KCLVM_VERSION := $(shell cat VERSION)
BUILD_IMAGE:=kusionstack/kclvm-builder:centos7
BUILD_IMAGE:=kusionstack/kclvm-builder

# export DOCKER_DEFAULT_PLATFORM=linux/amd64
# or
Expand Down
16 changes: 10 additions & 6 deletions kclvm/runner/src/assembler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ impl LibAssembler for LlvmLibAssembler {
/// At last remove the codegen temp files and return the dynamic link library path.
/// # Examples
///
/// ```no_run
/// ```
/// use kclvm_runner::runner::ExecProgramArgs;
/// use kclvm_parser::load_program;
/// use kclvm_sema::resolver::resolve_program;
Expand Down Expand Up @@ -454,22 +454,24 @@ impl KclvmAssembler {
///
/// # Examples
///
/// ```no_run
/// ```
/// use std::fs;
/// use kclvm_parser::load_program;
/// use kclvm_runner::runner::ExecProgramArgs;
/// use kclvm_runner::assembler::KclvmAssembler;
/// use kclvm_runner::assembler::KclvmLibAssembler;
/// use kclvm_runner::assembler::LlvmLibAssembler;
/// use kclvm_sema::resolver::resolve_program;
/// use kclvm_runner::command::Command;
///
/// let plugin_agent = 0;
///
/// let args = ExecProgramArgs::default();
/// let opts = args.get_load_program_options();
///
/// let kcl_path = "./src/test_datas/init_check_order_0/main.k";
/// let mut prog = load_program(&[kcl_path], Some(opts)).unwrap();
/// let kcl_path = fs::canonicalize("./src/test_datas/init_check_order_0/main.k").unwrap().display().to_string();
///
/// let mut prog = load_program(&[&kcl_path], Some(opts)).unwrap();
/// let scope = resolve_program(&mut prog);
///
/// let lib_paths = KclvmAssembler::new().gen_libs(
Expand All @@ -479,14 +481,16 @@ impl KclvmAssembler {
/// &("test_entry_file_name".to_string()),
/// KclvmLibAssembler::LLVM(LlvmLibAssembler {}));
/// assert_eq!(lib_paths.len(), 1);
/// println!("kcl path: {}", *lib_paths.get(0).unwrap());
///
/// let expected_lib_path = fs::canonicalize("./test_entry_file_name.dylib").unwrap().display().to_string();
/// let lib_path = format!("./test_entry_file_name{}", Command::get_lib_suffix());
/// let expected_lib_path = fs::canonicalize(lib_path).unwrap().display().to_string();
/// assert_eq!(*lib_paths.get(0).unwrap(), expected_lib_path);
///
/// let path = std::path::Path::new(&expected_lib_path);
/// assert_eq!(path.exists(), true);
///
/// KclvmAssembler::new().clean_path_for_genlibs(&expected_lib_path, ".dylib");
/// KclvmAssembler::new().clean_path_for_genlibs(&expected_lib_path, &Command::get_lib_suffix());
/// assert_eq!(path.exists(), false);
///```
pub fn gen_libs(
Expand Down
2 changes: 1 addition & 1 deletion kclvm/runner/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub mod tests;
///
/// # Examples
///
/// ```no_run
/// ```
/// use kclvm_runner::{execute, runner::ExecProgramArgs};
/// use kclvm_parser::load_program;
/// use kclvm_ast::ast::Program;
Expand Down
12 changes: 10 additions & 2 deletions kclvm/runner/src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
use crate::assembler::KclvmAssembler;
use crate::KclvmLibAssembler;
use crate::LlvmLibAssembler;
use crate::{execute, runner::ExecProgramArgs};
use kclvm_ast::ast::{Module, Program};
use std::{collections::HashMap, fs::File};
use kclvm_parser::load_program;
use kclvm_sema::resolver::resolve_program;
use std::{
collections::HashMap,
fs::{self, File},
};

const TEST_CASES: &[&'static str; 5] = &[
"init_check_order_0",
Expand Down Expand Up @@ -68,7 +76,7 @@ pub fn execute_for_test(kcl_path: &String) -> String {
}

// TODO: need to fix issue #79
// #[test]
#[test]
fn test_kclvm_runner_execute() {
for case in TEST_CASES {
let kcl_path = &format!("{}/{}/{}", TEST_CASE_PATH, case, KCL_FILE_NAME);
Expand Down

0 comments on commit 1a3729e

Please sign in to comment.