[tracker/sam/testutils-dir-fix] Fix subproject build when -Dfunctional_tests=false



commit 99ac4f3462a8e8208ccad27c11297f3a5e494c45
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Nov 4 01:18:50 2019 +0100

    Fix subproject build when -Dfunctional_tests=false
    
    When building tracker-miners with -Dtracker:functional_tests=false
    defined, it would fail with this error:
    
        meson.build:64:2: ERROR: Requested variable "tracker_uninstalled_testutils_dir" not found.

 meson.build                        | 1 +
 tests/functional-tests/meson.build | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index b7049890f..376c0784c 100644
--- a/meson.build
+++ b/meson.build
@@ -330,6 +330,7 @@ tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'trac
 tracker_uninstalled_domain_rule = join_paths(meson.current_source_dir(), 'src', 'tracker-store', 
'default.rule')
 tracker_uninstalled_nepomuk_ontologies_dir = join_paths(meson.current_source_dir(), 'src', 'ontologies', 
'nepomuk')
 tracker_uninstalled_stop_words_dir = join_paths(meson.current_source_dir(), 'src', 'libtracker-common', 
'stop-words')
+tracker_uninstalled_testutils_dir = join_paths(meson.current_source_dir(), 'utils')
 
 subdir('tests')
 
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index bf22d9cda..cd9b27c32 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -41,10 +41,7 @@ if get_option('fts')
 endif
 
 test_env = environment()
-
-tracker_uninstalled_testutils_dir = join_paths(meson.current_source_dir(), '..', '..', 'utils')
 test_env.prepend('PYTHONPATH', tracker_uninstalled_testutils_dir)
-
 test_env.set('TRACKER_FUNCTIONAL_TEST_CONFIG', config_json_full_path)
 
 foreach t: functional_tests


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]