Move tests a level higher (#58)

20 files changed, 2 insertions, 2 deletions

diff --git a/meson.build b/meson.build
index 52510a8..925acbd 100644
--- a/meson.build
+++ b/meson.build
@@ -117,6 +117,7 @@ gsettings_desktop_schema = dependency('gsettings-desktop-schemas', required: get
 build_dbus = get_option('dbus').disable_auto_if(['window', 'darwin'].contains(host_system)).allowed()
 
 subdir('src')
+subdir('tests')
 subdir('docs')
 
 summary({
diff --git a/src/meson.build b/src/meson.build
index fc61997..6aaf2f6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,3 @@
 subdir('backend')
 subdir('libproxy')
-subdir('tests')
 subdir('tools')
diff --git a/src/tests/config-env-test.c b/tests/config-env-test.c
index 34d3218..34d3218 100644
--- a/src/tests/config-env-test.c
+++ b/tests/config-env-test.c
diff --git a/src/tests/config-gnome-test.c b/tests/config-gnome-test.c
index 7d8223d..7d8223d 100644
--- a/src/tests/config-gnome-test.c
+++ b/tests/config-gnome-test.c
diff --git a/src/tests/config-kde-test.c b/tests/config-kde-test.c
index 9aba2d5..9aba2d5 100644
--- a/src/tests/config-kde-test.c
+++ b/tests/config-kde-test.c
diff --git a/src/tests/config-sysconfig-test.c b/tests/config-sysconfig-test.c
index 4cc0989..4cc0989 100644
--- a/src/tests/config-sysconfig-test.c
+++ b/tests/config-sysconfig-test.c
diff --git a/src/tests/data/px-manager-direct b/tests/data/px-manager-direct
index 72c4ac8..72c4ac8 100644
--- a/src/tests/data/px-manager-direct
+++ b/tests/data/px-manager-direct
diff --git a/src/tests/data/px-manager-nonpac b/tests/data/px-manager-nonpac
index 7db21d8..7db21d8 100644
--- a/src/tests/data/px-manager-nonpac
+++ b/tests/data/px-manager-nonpac
diff --git a/src/tests/data/px-manager-pac b/tests/data/px-manager-pac
index 2ff4000..2ff4000 100644
--- a/src/tests/data/px-manager-pac
+++ b/tests/data/px-manager-pac
diff --git a/src/tests/data/px-manager-sample.pac b/tests/data/px-manager-sample.pac
index b86c555..b86c555 100644
--- a/src/tests/data/px-manager-sample.pac
+++ b/tests/data/px-manager-sample.pac
diff --git a/src/tests/data/px-manager-wpad b/tests/data/px-manager-wpad
index 4ab0f81..4ab0f81 100644
--- a/src/tests/data/px-manager-wpad
+++ b/tests/data/px-manager-wpad
diff --git a/src/tests/data/sample-kde-proxy-disabled b/tests/data/sample-kde-proxy-disabled
index 9598abd..9598abd 100644
--- a/src/tests/data/sample-kde-proxy-disabled
+++ b/tests/data/sample-kde-proxy-disabled
diff --git a/src/tests/data/sample-kde-proxy-manual b/tests/data/sample-kde-proxy-manual
index c0a293b..c0a293b 100644
--- a/src/tests/data/sample-kde-proxy-manual
+++ b/tests/data/sample-kde-proxy-manual
diff --git a/src/tests/data/sample-kde-proxy-pac b/tests/data/sample-kde-proxy-pac
index c0db824..c0db824 100644
--- a/src/tests/data/sample-kde-proxy-pac
+++ b/tests/data/sample-kde-proxy-pac
diff --git a/src/tests/data/sample-kde-proxy-wpad b/tests/data/sample-kde-proxy-wpad
index 6eb1547..6eb1547 100644
--- a/src/tests/data/sample-kde-proxy-wpad
+++ b/tests/data/sample-kde-proxy-wpad
diff --git a/src/tests/data/sample-sysconfig-proxy b/tests/data/sample-sysconfig-proxy
index 1318f21..1318f21 100644
--- a/src/tests/data/sample-sysconfig-proxy
+++ b/tests/data/sample-sysconfig-proxy
diff --git a/src/tests/meson.build b/tests/meson.build
index 23a7e91..23a7e91 100644
--- a/src/tests/meson.build
+++ b/tests/meson.build
diff --git a/src/tests/px-manager-helper.c b/tests/px-manager-helper.c
index 725a312..223ad62 100644
--- a/src/tests/px-manager-helper.c
+++ b/tests/px-manager-helper.c
@@ -25,7 +25,7 @@
 PxManager *
 px_test_manager_new (const char *config_plugin)
 {
-  g_autofree char *path = g_strdup_printf ("%s/../backend/plugins", g_getenv ("G_TEST_BUILDDIR"));
+  g_autofree char *path = g_test_build_filename (G_TEST_BUILT, "../src/backend/plugins", NULL);
 
   return g_object_new (PX_TYPE_MANAGER,
                        "plugins-dir", path,
diff --git a/src/tests/px-manager-helper.h b/tests/px-manager-helper.h
index ad5d662..ad5d662 100644
--- a/src/tests/px-manager-helper.h
+++ b/tests/px-manager-helper.h
diff --git a/src/tests/px-manager-test.c b/tests/px-manager-test.c
index 8e3865f..8e3865f 100644
--- a/src/tests/px-manager-test.c
+++ b/tests/px-manager-test.c