anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix check_layout and adhere casing to other tests

Browse Source 
- Fixes cases such that it is the same as check_convert, check_filetools, check_listrings,
- Makes the compilation work on MSVC
This commit is contained in:
Vincent van Ravesteijn 2013-05-14 18:41:33 +02:00
parent db32d1b155
commit 6f16814d3b
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Makefile.am
View File

@ -671,20 +671,20 @@ endif
############################## Tests ################################## ############################## Tests ##################################
EXTRA_DIST += \ EXTRA_DIST += \
tests/test_Layout tests/test_layout
TESTS = \ TESTS = \
tests/test_Layout tests/test_layout
check_PROGRAMS = \ check_PROGRAMS = \
check_Layout check_layout
check_Layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS check_layout_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LAYOUT_CSS
check_Layout_LDADD = support/liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_layout_LDADD = support/liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) @LIBS@ $(QT4_CORE_LIBS) $(LIBSHLWAPI)
# need to allow multiple definitions of _() (see dummy_functions.cpp) # need to allow multiple definitions of _() (see dummy_functions.cpp)
check_Layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition check_layout_LDFLAGS = $(QT4_CORE_LDFLAGS) -Wl,--allow-multiple-definition
check_Layout_SOURCES = \ check_layout_SOURCES = \
insets/InsetLayout.cpp \ insets/InsetLayout.cpp \
Color.cpp \ Color.cpp \
Counters.cpp \ Counters.cpp \
@ -697,7 +697,7 @@ check_Layout_SOURCES = \
ModuleList.cpp \ ModuleList.cpp \
Spacing.cpp \ Spacing.cpp \
TextClass.cpp \ TextClass.cpp \
tests/check_Layout.cpp \ tests/check_layout.cpp \
support/tests/boost.cpp \ support/tests/boost.cpp \
support/tests/dummy_functions.cpp support/tests/dummy_functions.cpp

19
src/tests/CMakeLists.txt
View File

@ -4,33 +4,34 @@
# Copyright (c) 2013 Kornel Benko kornel@lyx.org # Copyright (c) 2013 Kornel Benko kornel@lyx.org
# #
set(check_Layout_SOURCES) set(check_layout_SOURCES)
foreach(_f insets/InsetLayout.cpp Color.cpp Counters.cpp Floating.cpp foreach(_f insets/InsetLayout.cpp Color.cpp Counters.cpp Floating.cpp
FloatList.cpp FontInfo.cpp Layout.cpp LayoutFile.cpp Lexer.cpp FloatList.cpp FontInfo.cpp Layout.cpp LayoutFile.cpp Lexer.cpp
ModuleList.cpp Spacing.cpp TextClass.cpp tests/check_Layout.cpp ModuleList.cpp Spacing.cpp TextClass.cpp tests/check_layout.cpp
support/tests/boost.cpp support/tests/dummy_functions.cpp) support/tests/boost.cpp support/tests/dummy_functions.cpp)
list(APPEND check_Layout_SOURCES "${TOP_SRC_DIR}/src/${_f}") list(APPEND check_layout_SOURCES "${TOP_SRC_DIR}/src/${_f}")
endforeach() endforeach()
add_definitions(-DNO_LAYOUT_CSS) add_definitions(-DNO_LAYOUT_CSS)
add_executable(check_Layout ${check_Layout_SOURCES}) add_executable(check_layout ${check_layout_SOURCES})
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--allow-multiple-definition")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") elseif(MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
else() else()
message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled") message(STATUS "Allow multiple definitions for cxx-compiler ${CMAKE_CXX_COMPILER_ID} not handled")
endif() endif()
target_link_libraries(check_Layout support ${QT_QTMAIN_LIBRARY}) target_link_libraries(check_layout support ${QT_QTMAIN_LIBRARY} ${intl_link})
add_dependencies(lyx_run_tests check_Layout) add_dependencies(lyx_run_tests check_layout)
set_target_properties(check_layout PROPERTIES FOLDER "tests/src")
file(GLOB layout_files RELATIVE "${TOP_SRC_DIR}/lib/layouts" "${TOP_SRC_DIR}/lib/layouts/*.layout") file(GLOB layout_files RELATIVE "${TOP_SRC_DIR}/lib/layouts" "${TOP_SRC_DIR}/lib/layouts/*.layout")
list(SORT layout_files) list(SORT layout_files)
foreach(bns ${layout_files}) foreach(bns ${layout_files})
string(REPLACE ".layout" "" bn ${bns}) string(REPLACE ".layout" "" bn ${bns})
add_test(NAME "check_Layout/${bns}" add_test(NAME "check_layout/${bns}"
COMMAND check_Layout "${TOP_SRC_DIR}/lib/layouts/${bn}") COMMAND check_layout "${TOP_SRC_DIR}/lib/layouts/${bn}")
endforeach() endforeach()

0
src/tests/check_Layout.cpp → src/tests/check_layout.cpp
View File

0
src/tests/test_Layout → src/tests/test_layout
View File