isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripting: Allow avoiding exiting perf helper

Browse Source 
This will help creating test cases where windows are open during
shutdown.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2722>
This commit is contained in:
Jonas Ådahl 2023-03-24 10:21:38 +01:00
parent ff705fa902
commit 2325022d2f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/scripting.js
View File

@ -1,7 +1,7 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported sleep, waitLeisure, createTestWindow, waitTestWindows, /* exported sleep, waitLeisure, createTestWindow, waitTestWindows,
destroyTestWindows, defineScriptEvent, scriptEvent, destroyTestWindows, defineScriptEvent, scriptEvent,
collectStatistics, runPerfScript */ collectStatistics, runPerfScript, disableHelperAutoExit */
const { Gio, GLib, Meta, Shell } = imports.gi; const { Gio, GLib, Meta, Shell } = imports.gi;
@ -70,8 +70,10 @@ function PerfHelper() {
let _perfHelper = null; let _perfHelper = null;
function _getPerfHelper() { function _getPerfHelper() {
if (_perfHelper == null) if (_perfHelper == null) {
_perfHelper = new PerfHelper(); _perfHelper = new PerfHelper();
_perfHelper._autoExit = true;
}
return _perfHelper; return _perfHelper;
} }
@ -140,6 +142,17 @@ function destroyTestWindows() {
perfHelper.DestroyWindowsAsync().catch(logError); perfHelper.DestroyWindowsAsync().catch(logError);
} }
/**
* disableHelperAutoExit:
*
* Don't exixt the perf helper after running the script. Instead it will remain
* running until something else makes it exit, e.g. the Wayland socket closing.
*/
function disableHelperAutoExit() {
let perfHelper = _getPerfHelper();
perfHelper._autoExit = false;
}
/** /**
* defineScriptEvent * defineScriptEvent
* @param {string} name: The event will be called script.<name> * @param {string} name: The event will be called script.<name>
@ -287,7 +300,8 @@ async function _runPerfScript(scriptModule, outputFile) {
try { try {
const perfHelper = _getPerfHelper(); const perfHelper = _getPerfHelper();
perfHelper.ExitSync(); if (perfHelper._autoExit)
perfHelper.ExitSync();
} catch (err) { } catch (err) {
log(`Failed to exit helper: ${err}\n${err.stack}`); log(`Failed to exit helper: ${err}\n${err.stack}`);
Meta.exit(Meta.ExitCode.ERROR); Meta.exit(Meta.ExitCode.ERROR);