diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-11-15 15:04:44 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-11-15 15:04:44 +0000 |
| commit | 6fb2f4c00aa3f7cb4004e4ac88c8bdc6b0573f09 (patch) | |
| tree | 2a4ebe4bc68067073ddf71d03617f8b7c89f2a8f | |
| parent | 336ff50c9736a9893cd12cb89c56e1db2cf6d57c (diff) | |
tests: Remove leftover references to valid-messages directory
Now that the directory doesn't exist in git, the embedded tests fail
in a clean git checkout.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | cmake/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dbus/dbus-message-util.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 0679fca51..7cef68c80 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -116,7 +116,6 @@ endif() ### keep these in creation order, i.e. uppermost dirs first set (TESTDIRS test/data - test/data/valid-messages test/data/invalid-messages test/data/incomplete-messages test/data/auth @@ -127,7 +126,6 @@ set (TESTDIRS test/data/valid-config-files/session.d test/data/valid-config-files-system test/data/valid-config-files-system/system.d - test/data/valid-messages test/data/valid-service-files test/data/valid-service-files-system test/data/invalid-config-files diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c index 1bfc0d00c..2a4cdf377 100644 --- a/dbus/dbus-message-util.c +++ b/dbus/dbus-message-util.c @@ -719,13 +719,7 @@ dbus_internal_do_not_use_foreach_message_file (const char *test_d retval = FALSE; _dbus_string_init_const (&test_directory, test_data_dir); - - if (!process_test_subdir (&test_directory, "valid-messages", - DBUS_VALID, func, user_data)) - goto failed; - check_memleaks (); - if (!process_test_subdir (&test_directory, "invalid-messages", DBUS_INVALID_FOR_UNKNOWN_REASON, func, user_data)) goto failed; |