diff options
author | Bastien Nocera <hadess@hadess.net> | 2021-03-18 11:37:09 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2021-03-18 11:42:11 +0100 |
commit | fa87bbefe00abd45e3dd8fdfcb90672dc3e7e6ee (patch) | |
tree | ddfab699e157ef68ca4832758610b39c099e0df8 | |
parent | 6148b0ced86e37aa461eb4a399a6573e2bc687fd (diff) | |
download | shared-mime-info-fa87bbefe00abd45e3dd8fdfcb90672dc3e7e6ee.tar.gz |
tests: Fix running staging test
The staging test is supposed to be an easy way to determine whether
database changes were taken into account.
Run it as part of the test suite, and make sure that the script doesn't
fail if we can't find files to determine the mime-types of.
-rw-r--r-- | tests/meson.build | 18 | ||||
-rwxr-xr-x | tests/test_staging.sh | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/meson.build b/tests/meson.build index a3d00c7a..cdf0b73e 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -3,15 +3,15 @@ if meson.is_cross_build() endif if xdgmime_found - run_target('test-staging', - command: [ - find_program('test_staging.sh'), - meson.source_root(), - meson.build_root(), - freedesktop_org_xml, - update_mime_database, - xdgmime_print_mime_data.path(), - ] + test('test-staging', + find_program('test_staging.sh'), + args: [ + meson.source_root(), + meson.build_root(), + freedesktop_org_xml, + update_mime_database, + xdgmime_print_mime_data.path(), + ] ) test('test-mime', diff --git a/tests/test_staging.sh b/tests/test_staging.sh index db6d919b..a993dcec 100755 --- a/tests/test_staging.sh +++ b/tests/test_staging.sh @@ -13,7 +13,7 @@ if [ ! -d "${source_root}/staging-tests" ]; then echo "***************************************************************************" echo "*** Add your file to process to staging-tests/ and run local-test again ***" echo "***************************************************************************" - exit 1 + exit 0 fi rm -rf "${tmp_dir}" |