diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt index 11f12a4f0d7..a20c52cd914 100644 --- a/systemtests/CMakeLists.txt +++ b/systemtests/CMakeLists.txt @@ -616,7 +616,7 @@ set(SYSTEM_TESTS reload-works-on-adding-second-director-resource reload-works-on-adding-client-resource backup-bareos-client-initiated-test - messages-test + messages-resource ) set(SYSTEM_TESTS_DISABLED # initially empty diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/messages/Standard.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/messages/Standard.conf.in diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Differential.conf b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Differential.conf similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Differential.conf rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Differential.conf diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Full.conf b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Full.conf similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Full.conf rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Full.conf diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Incremental.conf b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Incremental.conf similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Incremental.conf rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Incremental.conf diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Scratch.conf b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Scratch.conf similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/pool/Scratch.conf rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/pool/Scratch.conf diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/profile/operator.conf b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/profile/operator.conf similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/profile/operator.conf rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/profile/operator.conf diff --git a/systemtests/tests/messages-test/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/storage/File.conf.in similarity index 100% rename from systemtests/tests/messages-test/etc/bareos/bareos-dir.d/storage/File.conf.in rename to systemtests/tests/messages-resource/etc/bareos/bareos-dir.d/storage/File.conf.in diff --git a/systemtests/tests/messages-test/testrunner b/systemtests/tests/messages-resource/testrunner similarity index 100% rename from systemtests/tests/messages-test/testrunner rename to systemtests/tests/messages-resource/testrunner