summaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-18 20:14:01 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-18 20:14:01 +0300
commitdffd0a4a8e99196ad27f8fde2430b09dd29cac57 (patch)
treec9e4b9401844577805731686448a33bba1f10c2d /src/fs
parent7b3cf825ebf4f87cb6b1bf7c0a2107c4b2774766 (diff)
downloadmanaverse-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.tar.gz
manaverse-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.tar.bz2
manaverse-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.tar.xz
manaverse-dffd0a4a8e99196ad27f8fde2430b09dd29cac57.zip
Move catch.hpp into test directory.
Also replace include catch.hpp into generic unittests.h
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/files_unittest.cc5
-rw-r--r--src/fs/virtfs/virtfs1_unittest.cc2
-rw-r--r--src/fs/virtfs/virtfs_unittest.cc2
-rw-r--r--src/fs/virtfs/zip_unittest.cc2
4 files changed, 6 insertions, 5 deletions
diff --git a/src/fs/files_unittest.cc b/src/fs/files_unittest.cc
index 05953f04f..856162780 100644
--- a/src/fs/files_unittest.cc
+++ b/src/fs/files_unittest.cc
@@ -18,11 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "fs/files.h"
+#include "test/unittests.h"
-#include "catch.hpp"
#include "logger.h"
+#include "fs/files.h"
+
#include "fs/virtfs/fs.h"
#include "fs/virtfs/tools.h"
diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc
index 5b8059002..d7bf52006 100644
--- a/src/fs/virtfs/virtfs1_unittest.cc
+++ b/src/fs/virtfs/virtfs1_unittest.cc
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "catch.hpp"
+#include "test/unittests.h"
#include "fs/files.h"
diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc
index 24b9232fc..89676ce04 100644
--- a/src/fs/virtfs/virtfs_unittest.cc
+++ b/src/fs/virtfs/virtfs_unittest.cc
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "catch.hpp"
+#include "test/unittests.h"
#include "fs/files.h"
#include "fs/paths.h"
diff --git a/src/fs/virtfs/zip_unittest.cc b/src/fs/virtfs/zip_unittest.cc
index 09ebdb1f5..33755af87 100644
--- a/src/fs/virtfs/zip_unittest.cc
+++ b/src/fs/virtfs/zip_unittest.cc
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "catch.hpp"
+#include "test/unittests.h"
#include "logger.h"