diff --git a/aegisub/build/tests/tests.vcxproj b/aegisub/build/tests/tests.vcxproj
index 218823a87..71d734c5f 100644
--- a/aegisub/build/tests/tests.vcxproj
+++ b/aegisub/build/tests/tests.vcxproj
@@ -23,6 +23,7 @@
$(AegisubSourceBase)libaegisub\include;
+ $(SrcDir)support;
%(AdditionalIncludeDirectories)
@@ -37,32 +38,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
-
-
+
+
-
-
+
+
diff --git a/aegisub/build/tests/tests.vcxproj.filters b/aegisub/build/tests/tests.vcxproj.filters
index 3a6297a12..75aa7e626 100644
--- a/aegisub/build/tests/tests.vcxproj.filters
+++ b/aegisub/build/tests/tests.vcxproj.filters
@@ -11,72 +11,72 @@
-
+
Support
-
+
Support
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Tests
-
+
Support
-
+
Support
diff --git a/aegisub/tests/Makefile b/aegisub/tests/Makefile
index 06041676a..076a21d09 100644
--- a/aegisub/tests/Makefile
+++ b/aegisub/tests/Makefile
@@ -6,7 +6,7 @@ PROGRAM = run
LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet
LDFLAGS += -Wl,-rpath $(CURDIR)/../libaegisub $(LDFLAGS_ICONV)
-CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include
+CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include -I./support
CXXFLAGS += -Wno-unused-value
ifeq (yes, $(BUILD_DARWIN))
@@ -14,30 +14,29 @@ LDFLAGS += -framework ApplicationServices -framework Foundation
endif
SRC = \
- main.cpp \
- util.cpp \
- util_unix.cpp \
- libaegisub_access.cpp \
- libaegisub_cajun.cpp \
- libaegisub_color.cpp \
- libaegisub_dialogue_lexer.cpp \
- libaegisub_hotkey.cpp \
- libaegisub_iconv.cpp \
- libaegisub_keyframe.cpp \
- libaegisub_line_iterator.cpp \
- libaegisub_line_wrap.cpp \
- libaegisub_mru.cpp \
- libaegisub_option.cpp \
- libaegisub_path.cpp \
- libaegisub_signals.cpp \
- libaegisub_syntax_highlight.cpp \
- libaegisub_thesaurus.cpp \
- libaegisub_util.cpp \
- libaegisub_vfr.cpp \
- libaegisub_word_split.cpp \
+ support/main.cpp \
+ support/util.cpp \
+ support/util_unix.cpp \
+ tests/access.cpp \
+ tests/cajun.cpp \
+ tests/color.cpp \
+ tests/dialogue_lexer.cpp \
+ tests/hotkey.cpp \
+ tests/iconv.cpp \
+ tests/keyframe.cpp \
+ tests/line_iterator.cpp \
+ tests/line_wrap.cpp \
+ tests/mru.cpp \
+ tests/option.cpp \
+ tests/path.cpp \
+ tests/signals.cpp \
+ tests/syntax_highlight.cpp \
+ tests/thesaurus.cpp \
+ tests/util.cpp \
+ tests/vfr.cpp \
+ tests/word_split.cpp \
${GTEST_ROOT}/src/gtest-all.cc
-HEADER = \
- *.h
+HEADER = support/*.h tests/*.h
include ../Makefile.target
diff --git a/aegisub/tests/main.cpp b/aegisub/tests/support/main.cpp
similarity index 100%
rename from aegisub/tests/main.cpp
rename to aegisub/tests/support/main.cpp
diff --git a/aegisub/tests/main.h b/aegisub/tests/support/main.h
similarity index 100%
rename from aegisub/tests/main.h
rename to aegisub/tests/support/main.h
diff --git a/aegisub/tests/util.cpp b/aegisub/tests/support/util.cpp
similarity index 100%
rename from aegisub/tests/util.cpp
rename to aegisub/tests/support/util.cpp
diff --git a/aegisub/tests/util.h b/aegisub/tests/support/util.h
similarity index 100%
rename from aegisub/tests/util.h
rename to aegisub/tests/support/util.h
diff --git a/aegisub/tests/util_unix.cpp b/aegisub/tests/support/util_unix.cpp
similarity index 100%
rename from aegisub/tests/util_unix.cpp
rename to aegisub/tests/support/util_unix.cpp
diff --git a/aegisub/tests/util_windows.cpp b/aegisub/tests/support/util_windows.cpp
similarity index 100%
rename from aegisub/tests/util_windows.cpp
rename to aegisub/tests/support/util_windows.cpp
diff --git a/aegisub/tests/libaegisub_access.cpp b/aegisub/tests/tests/access.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_access.cpp
rename to aegisub/tests/tests/access.cpp
diff --git a/aegisub/tests/libaegisub_cajun.cpp b/aegisub/tests/tests/cajun.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_cajun.cpp
rename to aegisub/tests/tests/cajun.cpp
diff --git a/aegisub/tests/libaegisub_color.cpp b/aegisub/tests/tests/color.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_color.cpp
rename to aegisub/tests/tests/color.cpp
diff --git a/aegisub/tests/libaegisub_dialogue_lexer.cpp b/aegisub/tests/tests/dialogue_lexer.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_dialogue_lexer.cpp
rename to aegisub/tests/tests/dialogue_lexer.cpp
diff --git a/aegisub/tests/libaegisub_hotkey.cpp b/aegisub/tests/tests/hotkey.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_hotkey.cpp
rename to aegisub/tests/tests/hotkey.cpp
diff --git a/aegisub/tests/libaegisub_iconv.cpp b/aegisub/tests/tests/iconv.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_iconv.cpp
rename to aegisub/tests/tests/iconv.cpp
diff --git a/aegisub/tests/libaegisub_keyframe.cpp b/aegisub/tests/tests/keyframe.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_keyframe.cpp
rename to aegisub/tests/tests/keyframe.cpp
diff --git a/aegisub/tests/libaegisub_line_iterator.cpp b/aegisub/tests/tests/line_iterator.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_line_iterator.cpp
rename to aegisub/tests/tests/line_iterator.cpp
diff --git a/aegisub/tests/libaegisub_line_wrap.cpp b/aegisub/tests/tests/line_wrap.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_line_wrap.cpp
rename to aegisub/tests/tests/line_wrap.cpp
diff --git a/aegisub/tests/libaegisub_mru.cpp b/aegisub/tests/tests/mru.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_mru.cpp
rename to aegisub/tests/tests/mru.cpp
diff --git a/aegisub/tests/libaegisub_option.cpp b/aegisub/tests/tests/option.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_option.cpp
rename to aegisub/tests/tests/option.cpp
diff --git a/aegisub/tests/libaegisub_path.cpp b/aegisub/tests/tests/path.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_path.cpp
rename to aegisub/tests/tests/path.cpp
diff --git a/aegisub/tests/libaegisub_signals.cpp b/aegisub/tests/tests/signals.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_signals.cpp
rename to aegisub/tests/tests/signals.cpp
diff --git a/aegisub/tests/libaegisub_syntax_highlight.cpp b/aegisub/tests/tests/syntax_highlight.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_syntax_highlight.cpp
rename to aegisub/tests/tests/syntax_highlight.cpp
diff --git a/aegisub/tests/libaegisub_thesaurus.cpp b/aegisub/tests/tests/thesaurus.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_thesaurus.cpp
rename to aegisub/tests/tests/thesaurus.cpp
diff --git a/aegisub/tests/libaegisub_util.cpp b/aegisub/tests/tests/util.cpp
similarity index 97%
rename from aegisub/tests/libaegisub_util.cpp
rename to aegisub/tests/tests/util.cpp
index 36935c273..ec9a44f1d 100644
--- a/aegisub/tests/libaegisub_util.cpp
+++ b/aegisub/tests/tests/util.cpp
@@ -14,7 +14,7 @@
//
// Aegisub Project http://www.aegisub.org/
-#include "../libaegisub/config.h"
+#include "../../libaegisub/config.h"
#include
diff --git a/aegisub/tests/libaegisub_vfr.cpp b/aegisub/tests/tests/vfr.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_vfr.cpp
rename to aegisub/tests/tests/vfr.cpp
diff --git a/aegisub/tests/libaegisub_word_split.cpp b/aegisub/tests/tests/word_split.cpp
similarity index 100%
rename from aegisub/tests/libaegisub_word_split.cpp
rename to aegisub/tests/tests/word_split.cpp