| Message ID | 20260129124909.1258870-2-barnabas.pocze@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hi Barnabás, Thank you for the patch. On Thu, Jan 29, 2026 at 01:49:09PM +0100, Barnabás Pőcze wrote: > This enables the removal of the exit code workaround since the exit code is > now propagated to the host[0]. However, the single argument `--rwdir` does > not work as it did in 1.18, and the `<path>=<path>` form must be used > otherwise virtme-ng refuses to start[1]: > > error: cannot initialize <path> inside the guest (path must be defined inside a valid overlay) > > [0]: https://github.com/arighi/virtme-ng/pull/61 > [1]: https://github.com/arighi/virtme-ng/issues/409 > > Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > changes in v3: > * do not mount tmpfs to /tmp > (requires https://patchwork.libcamera.org/patch/26038/) > > v2: https://patchwork.libcamera.org/patch/25957/ > --- > .gitlab-ci/test-lc-compliance.sh | 6 ++---- > .gitlab-ci/test-libcamera-qemu.sh | 7 +++---- > gitlab-ci.yml | 2 +- > 3 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/.gitlab-ci/test-lc-compliance.sh b/.gitlab-ci/test-lc-compliance.sh > index 6208723..a888cae 100755 > --- a/.gitlab-ci/test-lc-compliance.sh > +++ b/.gitlab-ci/test-lc-compliance.sh > @@ -14,7 +14,7 @@ libcamera_compliance() { > --verbose \ > --skip-modules \ > --force-9p \ > - --rwdir "$PWD/build" \ > + --rwdir "$PWD/build=$PWD/build" \ > --run /opt/linux/bzImage \ > --exec " \ > set -x; \ > @@ -25,12 +25,10 @@ libcamera_compliance() { > UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 \ > GTEST_OUTPUT=xml:./build/lc-compliance-report.xml \ > lc-compliance -c Virtual0; \ > - echo \\\$? > ./build/.test-status; \ > " > > - local status=$(cat build/.test-status) > + local status=$? > echo "Test result exit state: $status" > - rm build/.test-status > > if [[ $status != 0 ]] ; then > exit $status > diff --git a/.gitlab-ci/test-libcamera-qemu.sh b/.gitlab-ci/test-libcamera-qemu.sh > index f9de5ab..7a05137 100755 > --- a/.gitlab-ci/test-libcamera-qemu.sh > +++ b/.gitlab-ci/test-libcamera-qemu.sh > @@ -24,13 +24,12 @@ libcamera_unit_test() { > echo "Running libcamera tests in a qemu VM" > > virtme-ng --verbose --skip-modules --force-9p \ > - --rwdir "$PWD/build" \ > + --rwdir "$PWD/build=$PWD/build" \ > --run /opt/linux/bzImage \ > - --exec "meson test -C build --no-rebuild --print-errorlogs; echo \\\$? > build/.test-status" > + --exec "meson test -C build --no-rebuild --print-errorlogs" > > - local status=$(cat build/.test-status) > + local status=$? > echo "Test result exit state: $status" > - rm build/.test-status > > if [[ $status != 0 ]] ; then > exit $status > diff --git a/gitlab-ci.yml b/gitlab-ci.yml > index bd5df66..3f80cb8 100644 > --- a/gitlab-ci.yml > +++ b/gitlab-ci.yml > @@ -34,7 +34,7 @@ variables: > ca-certificates > git > VIRTME_GIT_URL: 'https://github.com/arighi/virtme-ng.git' > - VIRTME_GIT_REF: 'v1.18' > + VIRTME_GIT_REF: 'v1.40' > > # Jobs that test individual commits need more history to find the common > # ancestor of the branch being tested and the default branch. Fetch up to 100
diff --git a/.gitlab-ci/test-lc-compliance.sh b/.gitlab-ci/test-lc-compliance.sh index 6208723..a888cae 100755 --- a/.gitlab-ci/test-lc-compliance.sh +++ b/.gitlab-ci/test-lc-compliance.sh @@ -14,7 +14,7 @@ libcamera_compliance() { --verbose \ --skip-modules \ --force-9p \ - --rwdir "$PWD/build" \ + --rwdir "$PWD/build=$PWD/build" \ --run /opt/linux/bzImage \ --exec " \ set -x; \ @@ -25,12 +25,10 @@ libcamera_compliance() { UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 \ GTEST_OUTPUT=xml:./build/lc-compliance-report.xml \ lc-compliance -c Virtual0; \ - echo \\\$? > ./build/.test-status; \ " - local status=$(cat build/.test-status) + local status=$? echo "Test result exit state: $status" - rm build/.test-status if [[ $status != 0 ]] ; then exit $status diff --git a/.gitlab-ci/test-libcamera-qemu.sh b/.gitlab-ci/test-libcamera-qemu.sh index f9de5ab..7a05137 100755 --- a/.gitlab-ci/test-libcamera-qemu.sh +++ b/.gitlab-ci/test-libcamera-qemu.sh @@ -24,13 +24,12 @@ libcamera_unit_test() { echo "Running libcamera tests in a qemu VM" virtme-ng --verbose --skip-modules --force-9p \ - --rwdir "$PWD/build" \ + --rwdir "$PWD/build=$PWD/build" \ --run /opt/linux/bzImage \ - --exec "meson test -C build --no-rebuild --print-errorlogs; echo \\\$? > build/.test-status" + --exec "meson test -C build --no-rebuild --print-errorlogs" - local status=$(cat build/.test-status) + local status=$? echo "Test result exit state: $status" - rm build/.test-status if [[ $status != 0 ]] ; then exit $status diff --git a/gitlab-ci.yml b/gitlab-ci.yml index bd5df66..3f80cb8 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -34,7 +34,7 @@ variables: ca-certificates git VIRTME_GIT_URL: 'https://github.com/arighi/virtme-ng.git' - VIRTME_GIT_REF: 'v1.18' + VIRTME_GIT_REF: 'v1.40' # Jobs that test individual commits need more history to find the common # ancestor of the branch being tested and the default branch. Fetch up to 100
This enables the removal of the exit code workaround since the exit code is now propagated to the host[0]. However, the single argument `--rwdir` does not work as it did in 1.18, and the `<path>=<path>` form must be used otherwise virtme-ng refuses to start[1]: error: cannot initialize <path> inside the guest (path must be defined inside a valid overlay) [0]: https://github.com/arighi/virtme-ng/pull/61 [1]: https://github.com/arighi/virtme-ng/issues/409 Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> --- changes in v3: * do not mount tmpfs to /tmp (requires https://patchwork.libcamera.org/patch/26038/) v2: https://patchwork.libcamera.org/patch/25957/ --- .gitlab-ci/test-lc-compliance.sh | 6 ++---- .gitlab-ci/test-libcamera-qemu.sh | 7 +++---- gitlab-ci.yml | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) -- 2.52.0