summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2018-04-06 13:46:47 +0200
committerBenjamin Berg <bberg@redhat.com>2018-04-17 15:26:59 +0200
commitd2d4980ce8595691c7bdeafc8dcc6e2ea7ceb1db (patch)
tree981937be3f2a20eaef335be0d52518621d683320
parentc2f601a9d442a756e5e82f13bff3934c27b9fb09 (diff)
downloadgnome-control-center-d2d4980ce8595691c7bdeafc8dcc6e2ea7ceb1db.tar.gz
Move panel/common tests into new tests subdirectory
-rw-r--r--meson.build2
-rw-r--r--panels/common/meson.build22
-rw-r--r--tests/common/hostnames-test.txt (renamed from panels/common/hostnames-test.txt)0
-rw-r--r--tests/common/meson.build23
-rw-r--r--tests/common/ssids-test.txt (renamed from panels/common/ssids-test.txt)0
-rw-r--r--tests/common/test-hostname.c (renamed from panels/common/test-hostname.c)0
-rw-r--r--tests/meson.build1
7 files changed, 26 insertions, 22 deletions
diff --git a/meson.build b/meson.build
index ae1a897b3..1b947ab01 100644
--- a/meson.build
+++ b/meson.build
@@ -255,6 +255,8 @@ subdir('panels')
subdir('shell')
subdir('search-provider')
+subdir('tests')
+
if get_option('documentation')
subdir('man')
endif
diff --git a/panels/common/meson.build b/panels/common/meson.build
index 42594360f..e9451e6d6 100644
--- a/panels/common/meson.build
+++ b/panels/common/meson.build
@@ -139,25 +139,3 @@ run_target(
command: script
)
-
-test_unit = 'test-hostname'
-
-sources = files(
- 'hostname-helper.c',
- test_unit + '.c'
-)
-
-cflags = [
- '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()),
- '-DTEST_TOPSRCDIR="@0@"'.format(meson.source_root())
-]
-
-exe = executable(
- test_unit,
- sources,
- include_directories: top_inc,
- dependencies: [ common_deps, libwidgets_dep ],
- c_args: cflags
-)
-
-test(test_unit, exe)
diff --git a/panels/common/hostnames-test.txt b/tests/common/hostnames-test.txt
index 5a31ce28b..5a31ce28b 100644
--- a/panels/common/hostnames-test.txt
+++ b/tests/common/hostnames-test.txt
diff --git a/tests/common/meson.build b/tests/common/meson.build
new file mode 100644
index 000000000..7fb2cdc23
--- /dev/null
+++ b/tests/common/meson.build
@@ -0,0 +1,23 @@
+
+
+test_unit = 'test-hostname'
+
+sources = files(
+ test_unit + '.c'
+)
+
+cflags = [
+ '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()),
+ '-DTEST_TOPSRCDIR="@0@"'.format(meson.source_root())
+]
+
+exe = executable(
+ test_unit,
+ sources,
+ include_directories: [ top_inc, common_inc ],
+ dependencies: common_deps + [libwidgets_dep],
+ c_args: cflags,
+)
+
+test(test_unit, exe)
+
diff --git a/panels/common/ssids-test.txt b/tests/common/ssids-test.txt
index 0545437cf..0545437cf 100644
--- a/panels/common/ssids-test.txt
+++ b/tests/common/ssids-test.txt
diff --git a/panels/common/test-hostname.c b/tests/common/test-hostname.c
index 4e14f715a..4e14f715a 100644
--- a/panels/common/test-hostname.c
+++ b/tests/common/test-hostname.c
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 000000000..1361dd315
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1 @@
+subdir('common')