tracker: use upstream patch instead of disabling test
This commit is contained in:
parent
f31f162bbf
commit
41e24f5f4b
3 changed files with 18 additions and 14 deletions
|
@ -1,5 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, gettext
|
||||
, meson
|
||||
|
@ -38,6 +39,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "Wtb1vJd4Hr9V7NaUfNSuf/QZJRZYDRC9g4Dx3UcZbtI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-test-order.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs utils/data-generators/cc/generate
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
@ -78,11 +87,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
patches = [ ./drop-sparql-test.patch ];
|
||||
postPatch = ''
|
||||
patchShebangs utils/data-generators/cc/generate
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file
|
||||
export HOME=$(mktemp -d)
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
https://gitlab.gnome.org/GNOME/tracker/-/issues/370
|
||||
--- a/tests/libtracker-data/meson.build
|
||||
+++ b/tests/libtracker-data/meson.build
|
||||
@@ -14,5 +14,4 @@
|
||||
libtracker_data_slow_tests = [
|
||||
'ontology',
|
||||
- 'sparql'
|
||||
]
|
||||
|
9
pkgs/development/libraries/tracker/fix-test-order.patch
Normal file
9
pkgs/development/libraries/tracker/fix-test-order.patch
Normal file
|
@ -0,0 +1,9 @@
|
|||
diff --git a/tests/libtracker-data/algebra/filter-scope-1.rq b/tests/libtracker-data/algebra/filter-scope-1.rq
|
||||
index 7ee5a24ad..a8cd89ca9 100644
|
||||
--- a/tests/libtracker-data/algebra/filter-scope-1.rq
|
||||
+++ b/tests/libtracker-data/algebra/filter-scope-1.rq
|
||||
@@ -7,3 +7,4 @@ SELECT ?v ?w ?v2
|
||||
OPTIONAL { :x :p ?v2 FILTER(?v = 1) }
|
||||
}
|
||||
}
|
||||
+ORDER BY ?v ?w ?v2
|
Loading…
Reference in a new issue