Rearrange the tests files

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

View file

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

View file

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

View file

@ -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

View file

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