[libhttpseverywhere] context: do not load srcdir data per default
- From: Daniel Brendle <elbren src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libhttpseverywhere] context: do not load srcdir data per default
- Date: Fri, 19 Jan 2018 20:23:24 +0000 (UTC)
commit 6161e8ee93e50bfb48ca8ffa3bf1246f279b5961
Author: grindhold <grindhold gmx net>
Date: Fri Jan 19 21:20:12 2018 +0100
context: do not load srcdir data per default
only load the rulesets from $sourcedir/data/default.rulesets when
we are executing httpseverywhere_test from a folder that ends with
"build/test", which is the folder that meson creates for our test
executable. this will prevent loading random crap data in production
src/context.vala | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/context.vala b/src/context.vala
index f54d8ab..f082cfc 100644
--- a/src/context.vala
+++ b/src/context.vala
@@ -104,7 +104,12 @@ namespace HTTPSEverywhere {
datapaths.add(Path.build_filename(dp, "libhttpseverywhere", rulesets_file));
// local rules in repo dir to test data without installation
- datapaths.add(Path.build_filename(Environment.get_current_dir(), "..", "data", rulesets_file));
+ // only works if the test executable is loaded from the build/test folder
+ // that meson generates
+ if (Environment.get_current_dir().has_suffix("build/test")) {
+ datapaths.add(Path.build_filename(Environment.get_current_dir(),
+ "..", "..", "data", rulesets_file));
+ }
parser = new Json.Parser();
bool success = false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]