From e7d290bbfb976bb857d47f2b099b0dfd2abb9068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 27 Jun 2023 20:27:53 +0200
Subject: [PATCH] tests: Stop bundling "perf" tests with gnome-shell

Now that scripts are loaded as external modules, there's no reason
anymore for bundling them with the gnome-shell executable. Just
move the scripts into a dedicated folder in tests/ and run them
from there.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2812>
---
 js/js-resources.gresource.xml                      | 6 ------
 tests/meson.build                                  | 2 +-
 {js/perf => tests/shell}/basic.js                  | 0
 {js/perf => tests/shell}/closeWithActiveWindows.js | 0
 {js/perf => tests/shell}/core.js                   | 0
 {js/perf => tests/shell}/headlessStart.js          | 0
 {js/perf => tests/shell}/hwtest.js                 | 0
 7 files changed, 1 insertion(+), 7 deletions(-)
 rename {js/perf => tests/shell}/basic.js (100%)
 rename {js/perf => tests/shell}/closeWithActiveWindows.js (100%)
 rename {js/perf => tests/shell}/core.js (100%)
 rename {js/perf => tests/shell}/headlessStart.js (100%)
 rename {js/perf => tests/shell}/hwtest.js (100%)

diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
index c6e479150..9c2c8881f 100644
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -35,12 +35,6 @@
     <file>misc/util.js</file>
     <file>misc/weather.js</file>
 
-    <file>perf/basic.js</file>
-    <file>perf/closeWithActiveWindows.js</file>
-    <file>perf/core.js</file>
-    <file>perf/headlessStart.js</file>
-    <file>perf/hwtest.js</file>
-
     <file>ui/accessDialog.js</file>
     <file>ui/altTab.js</file>
     <file>ui/animation.js</file>
diff --git a/tests/meson.build b/tests/meson.build
index 49cc3b1c2..d54bdbbbf 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -72,7 +72,7 @@ foreach shell_test : shell_tests
       test_tool,
       '--headless',
       options,
-      '@0@/js/perf/@1@.js'.format(meson.project_source_root(), test_name),
+      '@0@/shell/@1@.js'.format(meson.current_source_dir(), test_name),
     ],
     is_parallel: false,
     env: shell_testenv,
diff --git a/js/perf/basic.js b/tests/shell/basic.js
similarity index 100%
rename from js/perf/basic.js
rename to tests/shell/basic.js
diff --git a/js/perf/closeWithActiveWindows.js b/tests/shell/closeWithActiveWindows.js
similarity index 100%
rename from js/perf/closeWithActiveWindows.js
rename to tests/shell/closeWithActiveWindows.js
diff --git a/js/perf/core.js b/tests/shell/core.js
similarity index 100%
rename from js/perf/core.js
rename to tests/shell/core.js
diff --git a/js/perf/headlessStart.js b/tests/shell/headlessStart.js
similarity index 100%
rename from js/perf/headlessStart.js
rename to tests/shell/headlessStart.js
diff --git a/js/perf/hwtest.js b/tests/shell/hwtest.js
similarity index 100%
rename from js/perf/hwtest.js
rename to tests/shell/hwtest.js