diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-04-28 15:43:57 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-05-04 11:18:02 +1000 |
| commit | 56487581ea7660075abe5e874d5fa645c9b058a5 (patch) | |
| tree | a51f4f431803e79a2fb92208aa7e31e74f341947 | |
| parent | 2c869a72b6323a946315e3301328dff842c284ca (diff) | |
| download | libwacom-56487581ea7660075abe5e874d5fa645c9b058a5.tar.gz | |
test: move the data file test to the test/ directory
Makes more sense to have it here and this way it pollutes the directories less
(particularly for install_subdir() with meson).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | data/Makefile.am | 9 | ||||
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | test/Makefile.am | 6 | ||||
| -rwxr-xr-x | test/check-files-in-git.sh (renamed from data/check-files-in-git.sh) | 0 | ||||
| -rwxr-xr-x | test/test_data_files.py (renamed from data/test_data_files.py) | 0 |
5 files changed, 9 insertions, 13 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 26e70f9..17d8235 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,13 +7,6 @@ stylus_files = $(shell cd $(top_srcdir)/data; printf '%s\n' *.stylus) dist_libwacomstylus_DATA = $(stylus_files) EXTRA_DIST = \ - wacom.example \ - check-files-in-git.sh + wacom.example SUBDIRS = layouts - -noinst_SCRIPTS = check-files-in-git.sh test_data_files.py -EXTRA_DIST += $(noinst_SCRIPTS) - -AM_TESTS_ENVIRONMENT=top_srcdir="$(abs_top_srcdir)"; export top_srcdir; -TESTS = $(noinst_SCRIPTS) diff --git a/meson.build b/meson.build index 16cea9b..09c8e69 100644 --- a/meson.build +++ b/meson.build @@ -117,17 +117,14 @@ install_subdir('data', install_dir: dir_data, strip_directory: true, exclude_files: ['wacom.example', - 'check-files-in-git.sh', - 'test_data_files.py', 'Makefile.am', 'Makefile.in', 'layouts/Makefile.am', 'layouts/Makefile.in', - 'layouts/README.md'], - exclude_directories: ['__pycache__']) + 'layouts/README.md']) test('files-in-git', - find_program('data/check-files-in-git.sh'), + find_program('test/check-files-in-git.sh'), args: [meson.source_root()], suite: ['all']) diff --git a/test/Makefile.am b/test/Makefile.am index 852e52e..24e7453 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -43,3 +43,9 @@ test_tablet_svg_validity_LDADD = $(top_builddir)/libwacom/libwacom.la $(LIBXML_L test_tablet_svg_validity_LDFLAGS = -no-install test_tablet_svg_validity_CFLAGS = $(LIBXML_CFLAGS) endif + +noinst_SCRIPTS = check-files-in-git.sh test_data_files.py +EXTRA_DIST = $(noinst_SCRIPTS) + +AM_TESTS_ENVIRONMENT=top_srcdir="$(abs_top_srcdir)"; export top_srcdir; +TESTS = $(noinst_SCRIPTS) diff --git a/data/check-files-in-git.sh b/test/check-files-in-git.sh index a6252b5..a6252b5 100755 --- a/data/check-files-in-git.sh +++ b/test/check-files-in-git.sh diff --git a/data/test_data_files.py b/test/test_data_files.py index 3953b1e..3953b1e 100755 --- a/data/test_data_files.py +++ b/test/test_data_files.py |