CI

.github/workflows/main.yml

@@ -0,0 +1,84 @@
+name: main
+on:
+  push:
+    branches: [master]
+  pull_request:
+jobs:
+  jshint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: sudo npm install -g jshint; make jshint
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+
+    - uses: actions/cache@v2
+      id: cache-rustup
+      with:
+        path: ~/.cache/rustup/
+        key: ${{ runner.os }}-rustup
+    - name: rustup
+      run: |
+        rustup toolchain install nightly
+        rustup default nightly
+        rustup target add wasm32-unknown-unknown --toolchain nightly
+        rustup component add rustfmt-preview --toolchain nightly
+
+    - name: apt install
+      run: sudo apt update -qq; sudo apt install nasm gdb qemu-system-x86 libc6-dev-i386
+    - name: make all-debug
+      run: make all-debug
+    - name: make all
+      run: make all
+
+    - uses: actions/cache@v2
+      id: cache-kvm-unit-test
+      with:
+        path: tests/kvm-unit-tests/
+        key: ${{ runner.os }}-kvm-unit-test
+    - name: build kvm-unit-test
+      if: steps.cache-kvm-unit-test.outputs.cache-hit != 'true'
+      run: (cd tests/kvm-unit-tests && ./configure && make)
+    - name: kvm-unit-test
+      run: tests/kvm-unit-tests/run.js tests/kvm-unit-tests/x86/realmode.flat
+
+    - uses: actions/cache@v2
+      id: cache-nasmtests
+      with:
+        path: tests/nasm/build/
+        key: ${{ runner.os }}-nasmtests
+    - name: build namsmtests
+      if: steps.cache-nasmtests.outputs.cache-hit != 'true'
+      run: tests/nasm/create_tests.js; make -C tests/nasm all; ./tests/nasm/gen_fixtures.js
+    - name: nasmtests
+      run: MAX_PARALLEL_TESTS=1 ./tests/nasm/run.js
+    - name: nasmtests-force-jit
+      run: MAX_PARALLEL_TESTS=1 ./tests/nasm/run.js --force-jit
+
+    - name: rust-test
+      run: make rust-test
+
+    - uses: actions/cache@v2
+      id: cache-images
+      with:
+        path: images/
+        key: ${{ runner.os }}-images
+    - name: get images
+      if: steps.cache-images.outputs.cache-hit != 'true'
+      run: wget -nv -P images/ https://k.copy.sh/{linux.iso,linux3.iso,linux4.iso,buildroot-bzimage.bin,TinyCore-11.0.iso,oberon.img,msdos.img,openbsd-floppy.img,kolibri.img,windows101.img,os8.img,freedos722.img,qnx-demo-network-4.05.img,mobius-fd-release5.img}
+
+    - name: api-tests
+      run: make api-tests
+    - name: qemutests
+      run: make qemutests
+    - name: qemutests-release
+      run: make qemutests-release
+    - name: jitpagingtests
+      run: make jitpagingtests
+    - name: integration tests
+      run: MAX_PARALLEL_TESTS=1 make tests
+    - name: expect tests
+      run: make expect-tests

Makefile

@@ -296,13 +296,9 @@ devices-test: all-debug
 	./tests/devices/virtio_9p.js
 
 rust-test: $(RUST_FILES)
-	# RUSTFLAGS="-D warnings"
-	env RUST_BACKTRACE=full RUST_TEST_THREADS=1 cargo +nightly test -- --nocapture
+	env RUSTFLAGS="-D warnings" RUST_BACKTRACE=full RUST_TEST_THREADS=1 cargo +nightly test -- --nocapture
 	./tests/rust/verify-wasmgen-dummy-output.js
 
-rust-no-warnings:
-	RUSTFLAGS="-D warnings" make all all-debug
-
 rust-test-intensive:
 	QUICKCHECK_TESTS=100000000 make rust-test
 

src/rust/control_flow.rs

@@ -116,7 +116,7 @@ impl WasmStructure {
                     }
                 },
             }
-        };
+        }
 
         let mut result = HashSet::new();
         handle(self, edges, &mut result);