diff options
| author | ruki <[email protected]> | 2022-02-08 00:46:37 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-02-08 00:46:37 +0800 |
| commit | a2abcd6ce23c4742481e0ce832d06498557c890e (patch) | |
| tree | a2aa57e8711b6b9f906f2eb8924a6ce6d67c4808 | |
| parent | f141767f666d1b29c3e6c00c00c6813b26baf48e (diff) | |
fix tests
| -rw-r--r-- | .github/workflows/linux.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/linux_luajit.yml | 4 | ||||
| -rw-r--r-- | tests/projects/c/linker_scripts/test.lua | 3 | ||||
| -rw-r--r-- | tests/projects/c/linker_scripts/xmake.lua | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1851e45ab..296d97f46 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,6 +27,10 @@ jobs: - uses: little-core-labs/[email protected] id: tagName + - name: Prepare + run: | + sudo apt install -y ruby ruby-dev rubygems build-essential llvm + - name: Tests run: | xmake lua -v -D tests/run.lua @@ -34,7 +38,6 @@ jobs: - name: Artifact run: | - sudo apt install -y ruby ruby-dev rubygems build-essential sudo gem install --no-document fpm scripts/makepkg deb - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/linux_luajit.yml b/.github/workflows/linux_luajit.yml index 919c11550..674e5bd34 100644 --- a/.github/workflows/linux_luajit.yml +++ b/.github/workflows/linux_luajit.yml @@ -29,6 +29,10 @@ jobs: source ~/.xmake/profile xmake --version + - name: Prepare + run: | + sudo apt install -y build-essential llvm + - name: Tests run: | xmake lua -v -D tests/run.lua diff --git a/tests/projects/c/linker_scripts/test.lua b/tests/projects/c/linker_scripts/test.lua index b76241be2..b57362078 100644 --- a/tests/projects/c/linker_scripts/test.lua +++ b/tests/projects/c/linker_scripts/test.lua @@ -1,6 +1,3 @@ --- main entry function main(t) - - -- build project t:build() end diff --git a/tests/projects/c/linker_scripts/xmake.lua b/tests/projects/c/linker_scripts/xmake.lua index 51f17f68b..036c4b486 100644 --- a/tests/projects/c/linker_scripts/xmake.lua +++ b/tests/projects/c/linker_scripts/xmake.lua @@ -4,7 +4,9 @@ target("test") add_deps("foo") set_kind("binary") add_files("src/main.c") - add_files("src/main.lds") + if is_plat("linux") and is_arch("x86_64") then + add_files("src/main.lds") + end target("foo") set_kind("shared") |