sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

ci: Do not run create runtime dir on script setup

Browse source 
We do this per each test now.

As per this we need to ensure that one exists when running the virtme
tests

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3793>
This commit is contained in:
Marco Trevisan (Treviño) 2023-05-29 20:31:27 +02:00 committed by Marge Bot
parent fec38819ac
commit 504e0386cc
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -470,7 +470,6 @@ build-wayland-only@x86_64:
.test-setup: .test-setup:
variables: variables:
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data" GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
MUTTER_DEBUG_DUMMY_MODE_SPECS: "800x600@10.0" MUTTER_DEBUG_DUMMY_MODE_SPECS: "800x600@10.0"
PIPEWIRE_DEBUG: 2 PIPEWIRE_DEBUG: 2
@ -482,8 +481,6 @@ build-wayland-only@x86_64:
GTK_A11Y: "none" GTK_A11Y: "none"
before_script: before_script:
- !reference [.mutter.git-clone, before_script] - !reference [.mutter.git-clone, before_script]
# Disable e.g. audio support to not dead lock screen cast tests
- mkdir -m 700 $XDG_RUNTIME_DIR
.test-mutter-base: .test-mutter-base:
extends: extends:

10
src/tests/kvm/virtme-run.sh
View file

@ -20,6 +20,9 @@ MUTTER_DEBUG=$MUTTER_DEBUG \
$VM_ENV \ $VM_ENV \
" "
cleanup_paths=""
trap '{ rm -rf $cleanup_paths; }' EXIT
if [ ! -v $MUTTER_DEBUG_FORCE_KMS_MODE ]; then if [ ! -v $MUTTER_DEBUG_FORCE_KMS_MODE ]; then
VIRTME_ENV="$VIRTME_ENV MUTTER_DEBUG_FORCE_KMS_MODE=$MUTTER_DEBUG_FORCE_KMS_MODE" VIRTME_ENV="$VIRTME_ENV MUTTER_DEBUG_FORCE_KMS_MODE=$MUTTER_DEBUG_FORCE_KMS_MODE"
fi fi
@ -27,6 +30,13 @@ if [ ! -v $MUTTER_DEBUG_KMS_THREAD_TYPE ]; then
VIRTME_ENV="$VIRTME_ENV MUTTER_DEBUG_KMS_THREAD_TYPE=$MUTTER_DEBUG_KMS_THREAD_TYPE" VIRTME_ENV="$VIRTME_ENV MUTTER_DEBUG_KMS_THREAD_TYPE=$MUTTER_DEBUG_KMS_THREAD_TYPE"
fi fi
if [ ! -v "$XDG_RUNTIME_DIR" ]; then
tmpdir=$(mktemp -d --tmpdir mutter-runtime-XXXXXX)
chmod 700 "$tmpdir"
cleanup_paths="$cleanup_paths $tmpdir"
export XDG_RUNTIME_DIR="$tmpdir"
fi
if [[ "$(stat -c '%t:%T' -L /proc/$$/fd/0)" == "0:0" ]]; then if [[ "$(stat -c '%t:%T' -L /proc/$$/fd/0)" == "0:0" ]]; then
mkfifo $XDG_RUNTIME_DIR/fake-stdin.$$ mkfifo $XDG_RUNTIME_DIR/fake-stdin.$$
exec 0<> $XDG_RUNTIME_DIR/fake-stdin.$$ exec 0<> $XDG_RUNTIME_DIR/fake-stdin.$$