Skip to content

Commit 88e431c

Browse files
committed
try a different option
1 parent a6fac57 commit 88e431c

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

.github/workflows/linux.yml

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -166,47 +166,47 @@ jobs:
166166
- name: Clear CCache stats
167167
run: ccache --show-stats --zero-stats
168168

169-
- name: Test
170-
if: ${{ matrix.build-type == 'Debug' }}
171-
timeout-minutes: 2
172-
run: |
173-
instance_name=`/snap/bin/lxc --project snapcraft --format=csv --columns=n list | grep multipass`
174-
/snap/bin/lxc --project snapcraft start $instance_name
175-
/snap/bin/lxc --project snapcraft exec $instance_name -- \
176-
env CTEST_OUTPUT_ON_FAILURE=1 \
177-
LD_LIBRARY_PATH=/root/stage/usr/lib/x86_64-linux-gnu/:/root/stage/lib/:/root/parts/multipass/build/lib/ \
178-
/root/parts/multipass/build/bin/multipass_tests
179-
180-
- name: Measure coverage
181-
id: measure-coverage
182-
if: ${{ matrix.build-type == 'Coverage' }}
183-
env:
184-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
185-
timeout-minutes: 5
186-
run: |
187-
instance_name=`/snap/bin/lxc --project snapcraft --format=csv --columns=n list | grep multipass`
188-
/snap/bin/lxc --project snapcraft start $instance_name
189-
190-
# Wait for snapd to actually finish- in particular, that snaps are mounted
191-
timeout 10 sh -c \
192-
'while [ "$( /snap/bin/lxc --project snapcraft exec '$instance_name' -- \
193-
systemctl show --property=ActiveState snapd )" != "ActiveState=active" ]; do sleep 1; done'
194-
195-
# Wait for LXD container network to be ready like Snapcraft does
196-
timeout 40 sh -c \
197-
'while /snap/bin/lxc --project snapcraft exec '$instance_name' -- getent hosts canonical.com ; \
198-
[ $? -ne 0 ] ; do sleep 1; done'
199-
200-
# The following 2 commands workaround the issue in 20.04 where the default parsing of the coverage
201-
# JSON file is extremely slow. This makes is use fast parsing.
202-
/snap/bin/lxc --project snapcraft exec $instance_name -- apt-get -y install libjson-xs-perl sudo
203-
/snap/bin/lxc --project snapcraft exec $instance_name -- \
204-
sh -c "sudo sed -i \"s/use JSON::PP/use JSON::XS/\" \`which geninfo\`"
205-
206-
/snap/bin/lxc --project snapcraft exec $instance_name -- \
207-
env CTEST_OUTPUT_ON_FAILURE=1 \
208-
cmake --build /root/parts/multipass/build --target covreport
209-
bash <(curl -s https://codecov.io/bash) -Z -s ${{ steps.coverage-setup.outputs.build }}
169+
# - name: Test
170+
# if: ${{ matrix.build-type == 'Debug' }}
171+
# timeout-minutes: 2
172+
# run: |
173+
# instance_name=`/snap/bin/lxc --project snapcraft --format=csv --columns=n list | grep multipass`
174+
# /snap/bin/lxc --project snapcraft start $instance_name
175+
# /snap/bin/lxc --project snapcraft exec $instance_name -- \
176+
# env CTEST_OUTPUT_ON_FAILURE=1 \
177+
# LD_LIBRARY_PATH=/root/stage/usr/lib/x86_64-linux-gnu/:/root/stage/lib/:/root/parts/multipass/build/lib/ \
178+
# /root/parts/multipass/build/bin/multipass_tests
179+
180+
# - name: Measure coverage
181+
# id: measure-coverage
182+
# if: ${{ matrix.build-type == 'Coverage' }}
183+
# env:
184+
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
185+
# timeout-minutes: 5
186+
# run: |
187+
# instance_name=`/snap/bin/lxc --project snapcraft --format=csv --columns=n list | grep multipass`
188+
# /snap/bin/lxc --project snapcraft start $instance_name
189+
190+
# # Wait for snapd to actually finish- in particular, that snaps are mounted
191+
# timeout 10 sh -c \
192+
# 'while [ "$( /snap/bin/lxc --project snapcraft exec '$instance_name' -- \
193+
# systemctl show --property=ActiveState snapd )" != "ActiveState=active" ]; do sleep 1; done'
194+
195+
# # Wait for LXD container network to be ready like Snapcraft does
196+
# timeout 40 sh -c \
197+
# 'while /snap/bin/lxc --project snapcraft exec '$instance_name' -- getent hosts canonical.com ; \
198+
# [ $? -ne 0 ] ; do sleep 1; done'
199+
200+
# # The following 2 commands workaround the issue in 20.04 where the default parsing of the coverage
201+
# # JSON file is extremely slow. This makes is use fast parsing.
202+
# /snap/bin/lxc --project snapcraft exec $instance_name -- apt-get -y install libjson-xs-perl sudo
203+
# /snap/bin/lxc --project snapcraft exec $instance_name -- \
204+
# sh -c "sudo sed -i \"s/use JSON::PP/use JSON::XS/\" \`which geninfo\`"
205+
206+
# /snap/bin/lxc --project snapcraft exec $instance_name -- \
207+
# env CTEST_OUTPUT_ON_FAILURE=1 \
208+
# cmake --build /root/parts/multipass/build --target covreport
209+
# bash <(curl -s https://codecov.io/bash) -Z -s ${{ steps.coverage-setup.outputs.build }}
210210

211211
- name: Continue on Error comment
212212
uses: mainmatter/continue-on-error-comment@v1

src/platform/backends/qemu/qemu_vm_process_spec.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ profile %1 flags=(attach_disconnected) {
158158
/{usr/,}bin/cat rmix,
159159
160160
# to execute bridge helper
161-
%4/bin/bridge_helper x,
161+
%4/bin/bridge_helper ixr,
162162
163163
# for restore
164164
/{usr/,}bin/bash rmix,

0 commit comments

Comments
 (0)