Skip to content

Commit

Permalink
Add CI targets, fix test_std.js
Browse files Browse the repository at this point in the history
This switches the exec test to `SIGTERM` rather than `SIGQUIT` since the
latter didn’t seem to work in QEMU, and the distinction doesn’t really
matter for this test.

This also makes the `isatty()` check smarter by checking whether `STDIN`
is, in fact, a terminal.

Added qemu-alpine targets i386, arm32v6, arm32v7, arm64v8, s390x
  • Loading branch information
FGasper committed Mar 3, 2024
1 parent ebe7496 commit 1d119aa
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 31 deletions.
79 changes: 52 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,41 @@ on:
- '.github/workflows/ci.yml'
push:
branches:
- master
- '*'

jobs:
linux:
name: Linux (Ubuntu)
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
- name: Build
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y
- name: stats
- name: Stats
run: |
./qjs -qd
- name: test
- name: Run built-in tests
run: |
make test
- name: microbench
- name: Run microbench
run: |
make microbench
linux-asan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
- name: Build
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y CONFIG_ASAN=y
- name: test
- name: Run built-in tests
env:
ASAN_OPTIONS: halt_on_error=1
run: |
Expand All @@ -54,15 +55,15 @@ jobs:
linux-msan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
- name: Build
env:
CC: clang
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y CONFIG_MSAN=y CONFIG_CLANG=y
- name: test
- name: Run built-in tests
env:
MSAN_OPTIONS: halt_on_error=1
run: |
Expand All @@ -71,42 +72,43 @@ jobs:
linux-ubsan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: build
- name: Build
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y CONFIG_UBSAN=y
- name: test
- name: Run built-in tests
env:
UBSAN_OPTIONS: halt_on_error=1
run: |
make CONFIG_UBSAN=y test
macos:
name: macOS
runs-on: macos-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: build
- uses: actions/checkout@v4
- name: Build
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y
- name: stats
- name: Stats
run: |
./qjs -qd
- name: test
- name: Run built-in tests
run: |
make test
macos-asan:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: build
- uses: actions/checkout@v4
- name: Build
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y CONFIG_ASAN=y
- name: test
- name: Run built-in tests
env:
ASAN_OPTIONS: halt_on_error=1
run: |
Expand All @@ -115,11 +117,11 @@ jobs:
macos-ubsan:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: build
- uses: actions/checkout@v4
- name: Build
run: |
make -j$(getconf _NPROCESSORS_ONLN) CONFIG_WERROR=y CONFIG_UBSAN=y
- name: test
- name: Run built-in tests
env:
UBSAN_OPTIONS: halt_on_error=1
run: |
Expand All @@ -128,8 +130,8 @@ jobs:
freebsd:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: build + test
- uses: actions/checkout@v4
- name: Build + test
uses: vmactions/freebsd-vm@v1
with:
usesh: true
Expand All @@ -139,3 +141,26 @@ jobs:
gmake
./qjs -qd
gmake test
qemu-alpine:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
platform:
- i386
- arm32v6
- arm32v7
- arm64v8
- s390x

steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Get qemu
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Run tests on ${{ matrix.platform }}
run: docker run --rm --interactive --mount type=bind,source=$(pwd),target=/host ${{ matrix.platform }}/alpine sh -c "apk add git patch make gcc libc-dev && cd /host && make test"

10 changes: 6 additions & 4 deletions tests/test_std.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ function test_os()
{
var fd, fpath, fname, fdir, buf, buf2, i, files, err, fdate, st, link_path;

// XXX(bnoordhuis) disabled because stdio is not a tty on CI
//assert(os.isatty(0));
const stdinIsTTY = !os.exec(["/bin/sh", "-c", "test -t 0"], { usePath: false });

assert(os.isatty(0), stdinIsTTY, `isatty(STDIN)`);

fdir = "test_tmp_dir";
fname = "tmp_file.txt";
Expand Down Expand Up @@ -254,10 +255,11 @@ function test_os_exec()

pid = os.exec(["cat"], { block: false } );
assert(pid >= 0);
os.kill(pid, os.SIGQUIT);
os.kill(pid, os.SIGTERM);
[ret, status] = os.waitpid(pid, 0);
assert(ret, pid);
assert(status & 0x7f, os.SIGQUIT);
assert(status !== 0, true, `expect nonzero exit code (got ${status})`);
assert(status & 0x7f, os.SIGTERM);
}

function test_timer()
Expand Down

0 comments on commit 1d119aa

Please sign in to comment.