mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Rearrange the tests files

Browse source
This commit is contained in:
Thomas Goyne 2013-01-31 06:39:31 -08:00
parent 09aa873ed7
commit 1cc52611de
27 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
aegisub/build/tests/tests.vcxproj
View file

@ -23,6 +23,7 @@
</PreprocessorDefinitions> </PreprocessorDefinitions>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
$(AegisubSourceBase)libaegisub\include; $(AegisubSourceBase)libaegisub\include;
$(SrcDir)support;
%(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
@ -37,32 +38,32 @@
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SrcDir)libaegisub_access.cpp" /> <ClCompile Include="$(SrcDir)tests\access.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_cajun.cpp" /> <ClCompile Include="$(SrcDir)tests\cajun.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_color.cpp" /> <ClCompile Include="$(SrcDir)tests\color.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_dialogue_lexer.cpp" /> <ClCompile Include="$(SrcDir)tests\dialogue_lexer.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_hotkey.cpp" /> <ClCompile Include="$(SrcDir)tests\hotkey.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_iconv.cpp" /> <ClCompile Include="$(SrcDir)tests\iconv.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_keyframe.cpp" /> <ClCompile Include="$(SrcDir)tests\keyframe.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_line_iterator.cpp" /> <ClCompile Include="$(SrcDir)tests\line_iterator.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_line_wrap.cpp" /> <ClCompile Include="$(SrcDir)tests\line_wrap.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_mru.cpp" /> <ClCompile Include="$(SrcDir)tests\mru.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_option.cpp" /> <ClCompile Include="$(SrcDir)tests\option.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_path.cpp" /> <ClCompile Include="$(SrcDir)tests\path.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_signals.cpp" /> <ClCompile Include="$(SrcDir)tests\signals.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_syntax_highlight.cpp" /> <ClCompile Include="$(SrcDir)tests\syntax_highlight.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_thesaurus.cpp" /> <ClCompile Include="$(SrcDir)tests\thesaurus.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_util.cpp" /> <ClCompile Include="$(SrcDir)tests\util.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_vfr.cpp" /> <ClCompile Include="$(SrcDir)tests\vfr.cpp" />
<ClCompile Include="$(SrcDir)libaegisub_word_split.cpp"> <ClCompile Include="$(SrcDir)tests\word_split.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)main.cpp" /> <ClCompile Include="$(SrcDir)support\main.cpp" />
<ClCompile Include="$(SrcDir)util.cpp" /> <ClCompile Include="$(SrcDir)support\util.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SrcDir)main.h" /> <ClInclude Include="$(SrcDir)support\main.h" />
<ClInclude Include="$(SrcDir)util.h" /> <ClInclude Include="$(SrcDir)support\util.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="$(SrcDir)setup.bat" /> <None Include="$(SrcDir)setup.bat" />

44
aegisub/build/tests/tests.vcxproj.filters
View file

@ -11,72 +11,72 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SrcDir)main.cpp"> <ClCompile Include="$(SrcDir)support\main.cpp">
<Filter>Support</Filter> <Filter>Support</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)util.cpp"> <ClCompile Include="$(SrcDir)support\util.cpp">
<Filter>Support</Filter> <Filter>Support</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_access.cpp"> <ClCompile Include="$(SrcDir)tests\access.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_cajun.cpp"> <ClCompile Include="$(SrcDir)tests\cajun.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_color.cpp"> <ClCompile Include="$(SrcDir)tests\color.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_dialogue_lexer.cpp"> <ClCompile Include="$(SrcDir)tests\dialogue_lexer.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_hotkey.cpp"> <ClCompile Include="$(SrcDir)tests\hotkey.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_iconv.cpp"> <ClCompile Include="$(SrcDir)tests\iconv.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_keyframe.cpp"> <ClCompile Include="$(SrcDir)tests\keyframe.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_line_iterator.cpp"> <ClCompile Include="$(SrcDir)tests\line_iterator.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_line_wrap.cpp"> <ClCompile Include="$(SrcDir)tests\line_wrap.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_mru.cpp"> <ClCompile Include="$(SrcDir)tests\mru.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_option.cpp"> <ClCompile Include="$(SrcDir)tests\option.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_path.cpp"> <ClCompile Include="$(SrcDir)tests\path.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_signals.cpp"> <ClCompile Include="$(SrcDir)tests\signals.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_syntax_highlight.cpp"> <ClCompile Include="$(SrcDir)tests\syntax_highlight.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_thesaurus.cpp"> <ClCompile Include="$(SrcDir)tests\thesaurus.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_util.cpp"> <ClCompile Include="$(SrcDir)tests\util.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_vfr.cpp"> <ClCompile Include="$(SrcDir)tests\vfr.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SrcDir)libaegisub_word_split.cpp"> <ClCompile Include="$(SrcDir)tests\word_split.cpp">
<Filter>Tests</Filter> <Filter>Tests</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SrcDir)main.h"> <ClInclude Include="$(SrcDir)support\main.h">
<Filter>Support</Filter> <Filter>Support</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SrcDir)util.h"> <ClInclude Include="$(SrcDir)support\util.h">
<Filter>Support</Filter> <Filter>Support</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

47
aegisub/tests/Makefile
View file

@ -6,7 +6,7 @@ PROGRAM = run
LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet
LDFLAGS += -Wl,-rpath $(CURDIR)/../libaegisub $(LDFLAGS_ICONV) 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 CXXFLAGS += -Wno-unused-value
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
@ -14,30 +14,29 @@ LDFLAGS += -framework ApplicationServices -framework Foundation
endif endif
SRC = \ SRC = \
main.cpp \ support/main.cpp \
util.cpp \ support/util.cpp \
util_unix.cpp \ support/util_unix.cpp \
libaegisub_access.cpp \ tests/access.cpp \
libaegisub_cajun.cpp \ tests/cajun.cpp \
libaegisub_color.cpp \ tests/color.cpp \
libaegisub_dialogue_lexer.cpp \ tests/dialogue_lexer.cpp \
libaegisub_hotkey.cpp \ tests/hotkey.cpp \
libaegisub_iconv.cpp \ tests/iconv.cpp \
libaegisub_keyframe.cpp \ tests/keyframe.cpp \
libaegisub_line_iterator.cpp \ tests/line_iterator.cpp \
libaegisub_line_wrap.cpp \ tests/line_wrap.cpp \
libaegisub_mru.cpp \ tests/mru.cpp \
libaegisub_option.cpp \ tests/option.cpp \
libaegisub_path.cpp \ tests/path.cpp \
libaegisub_signals.cpp \ tests/signals.cpp \
libaegisub_syntax_highlight.cpp \ tests/syntax_highlight.cpp \
libaegisub_thesaurus.cpp \ tests/thesaurus.cpp \
libaegisub_util.cpp \ tests/util.cpp \
libaegisub_vfr.cpp \ tests/vfr.cpp \
libaegisub_word_split.cpp \ tests/word_split.cpp \
${GTEST_ROOT}/src/gtest-all.cc ${GTEST_ROOT}/src/gtest-all.cc
HEADER = \ HEADER = support/*.h tests/*.h
*.h
include ../Makefile.target include ../Makefile.target

0
aegisub/tests/main.cpp → aegisub/tests/support/main.cpp
View file

0
aegisub/tests/main.h → aegisub/tests/support/main.h
View file

0
aegisub/tests/util.cpp → aegisub/tests/support/util.cpp
View file

0
aegisub/tests/util.h → aegisub/tests/support/util.h
View file

0
aegisub/tests/util_unix.cpp → aegisub/tests/support/util_unix.cpp
View file

0
aegisub/tests/util_windows.cpp → aegisub/tests/support/util_windows.cpp
View file

0
aegisub/tests/libaegisub_access.cpp → aegisub/tests/tests/access.cpp
View file

0
aegisub/tests/libaegisub_cajun.cpp → aegisub/tests/tests/cajun.cpp
View file

0
aegisub/tests/libaegisub_color.cpp → aegisub/tests/tests/color.cpp
View file

0
aegisub/tests/libaegisub_dialogue_lexer.cpp → aegisub/tests/tests/dialogue_lexer.cpp
View file

0
aegisub/tests/libaegisub_hotkey.cpp → aegisub/tests/tests/hotkey.cpp
View file

0
aegisub/tests/libaegisub_iconv.cpp → aegisub/tests/tests/iconv.cpp
View file

0
aegisub/tests/libaegisub_keyframe.cpp → aegisub/tests/tests/keyframe.cpp
View file

0
aegisub/tests/libaegisub_line_iterator.cpp → aegisub/tests/tests/line_iterator.cpp
View file

0
aegisub/tests/libaegisub_line_wrap.cpp → aegisub/tests/tests/line_wrap.cpp
View file

0
aegisub/tests/libaegisub_mru.cpp → aegisub/tests/tests/mru.cpp
View file

0
aegisub/tests/libaegisub_option.cpp → aegisub/tests/tests/option.cpp
View file

0
aegisub/tests/libaegisub_path.cpp → aegisub/tests/tests/path.cpp
View file

0
aegisub/tests/libaegisub_signals.cpp → aegisub/tests/tests/signals.cpp
View file

0
aegisub/tests/libaegisub_syntax_highlight.cpp → aegisub/tests/tests/syntax_highlight.cpp
View file

0
aegisub/tests/libaegisub_thesaurus.cpp → aegisub/tests/tests/thesaurus.cpp
View file

2
aegisub/tests/libaegisub_util.cpp → aegisub/tests/tests/util.cpp
View file

@ -14,7 +14,7 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../libaegisub/config.h" #include "../../libaegisub/config.h"
#include <libaegisub/util.h> #include <libaegisub/util.h>

0
aegisub/tests/libaegisub_vfr.cpp → aegisub/tests/tests/vfr.cpp
View file

0
aegisub/tests/libaegisub_word_split.cpp → aegisub/tests/tests/word_split.cpp
View file