-
-
Notifications
You must be signed in to change notification settings - Fork 13.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
69 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
pkgs/development/tools/flatpak-builder/fix-test-prefix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/meson_options.txt b/meson_options.txt | ||
index d5a0bd22..7d69d3d2 100644 | ||
--- a/meson_options.txt | ||
+++ b/meson_options.txt | ||
@@ -22,6 +22,12 @@ option( | ||
value: true, | ||
description: 'Whether to build and run unit tests' | ||
) | ||
+option( | ||
+ 'installed_test_prefix', | ||
+ type: 'string', | ||
+ value: '', | ||
+ description: 'Prefix for installed tests' | ||
+) | ||
option( | ||
'fuse', | ||
type: 'combo', | ||
diff --git a/tests/meson.build b/tests/meson.build | ||
index 6ec405d1..f43c165c 100644 | ||
--- a/tests/meson.build | ||
+++ b/tests/meson.build | ||
@@ -1,5 +1,5 @@ | ||
-installed_testdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / 'flatpak-builder' | ||
-installed_tests_metadir = get_option('prefix') / get_option('datadir') / 'installed-tests' / 'flatpak-builder' | ||
+installed_testdir = get_option('installed_test_prefix') / get_option('libexecdir') / 'installed-tests' / 'flatpak-builder' | ||
+installed_tests_metadir = get_option('installed_test_prefix') / get_option('datadir') / 'installed-tests' / 'flatpak-builder' | ||
|
||
test_env = environment() | ||
test_env.set('FLATPAK_TESTS_DEBUG', '1') |