From 5fb81b88b112d6ac90e5d92c4507220f280eb8a8 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 6 Jul 2021 19:44:01 -0700 Subject: [PATCH] ci: run tests w/ RTEMS5 --- .github/workflows/ci-scripts-build.yml | 3 +-- test/testget.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 098526d..2505dc3 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -66,7 +66,6 @@ jobs: base: "7.0" rtems: "5" rtems_target: RTEMS-pc686-qemu - test: NO - name: Native Linux with clang os: ubuntu-20.04 @@ -118,7 +117,7 @@ jobs: - name: "apt-get install" run: | sudo apt-get update - sudo apt-get -y install g++-mingw-w64-x86-64 cmake gdb + sudo apt-get -y install g++-mingw-w64-x86-64 cmake gdb qemu-system-x86 if: runner.os == 'Linux' - name: Automatic core dumper analysis uses: mdavidsaver/ci-core-dumper@master diff --git a/test/testget.cpp b/test/testget.cpp index e4c8eea..71487ea 100644 --- a/test/testget.cpp +++ b/test/testget.cpp @@ -97,7 +97,8 @@ struct Tester { testEq(evt.discd, 1u); // initially disconnected testEq(evt.connd, 1u); testTrue(evt2.wait(true, 5.0))<<" Wait for Connect 2"; - testEq(evt2.discd, 1u); // initially disconnected + // evt2 may not see the initial "fake" disconnected event if the channel has already connected + testOk(evt2.discd<=1u, "second event #discd=%zu", evt2.discd.load()); // initially disconnected testEq(evt2.connd, 1u); // ensure de-dup of connected