kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Simplify LoadCommand tests 

Drop out-of-place coverage of CheckFunctionExists module.  The "printf"
symbol is not available on VS 14 without including the <stdio.h> header
to get a definition.
This commit is contained in:
Brad King 2014-06-25 15:26:18 -04:00
parent b1cbd577c1
commit 5c10514059
6 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/LoadCommand/CMakeLists.txt
View File

@ -8,10 +8,6 @@ include (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
CHECK_TYPE_SIZE(char SIZEOF_CHAR) CHECK_TYPE_SIZE(char SIZEOF_CHAR)
CHECK_TYPE_SIZE(short SIZEOF_SHORT) CHECK_TYPE_SIZE(short SIZEOF_SHORT)
include (CheckFunctionExists)
CHECK_FUNCTION_EXISTS(printf HAVE_PRINTF)
CHECK_FUNCTION_EXISTS(vsblabla HAVE_VSBLABLA)
configure_file(${LoadCommand_SOURCE_DIR}/LoadedCommand.h.in configure_file(${LoadCommand_SOURCE_DIR}/LoadedCommand.h.in
${LoadCommand_BINARY_DIR}/LoadedCommand.h) ${LoadCommand_BINARY_DIR}/LoadedCommand.h)

9
Tests/LoadCommand/LoadedCommand.cxx.in
View File

@ -9,15 +9,6 @@ int testSizeOf(int s1, int s2)
int main () int main ()
{ {
int ret = 0; int ret = 0;
#ifdef HAVE_VSBLABLA
printf("Should not be able to find vsblabla\n");
ret = 1;
#endif
#if !defined( HAVE_PRINTF )
printf("Should be able to find printf\n");
ret= 1;
#endif
#if !defined( ADDED_DEFINITION ) #if !defined( ADDED_DEFINITION )
printf("Should have ADDED_DEFINITION defined\n"); printf("Should have ADDED_DEFINITION defined\n");

4
Tests/LoadCommand/LoadedCommand.h.in
View File

@ -1,7 +1,3 @@
/* Check for size of types */ /* Check for size of types */
#cmakedefine SIZEOF_CHAR ${SIZEOF_CHAR} #cmakedefine SIZEOF_CHAR ${SIZEOF_CHAR}
#cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT} #cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT}
/* Check for functions */
#cmakedefine HAVE_PRINTF
#cmakedefine HAVE_VSBLABLA

4
Tests/LoadCommandOneConfig/CMakeLists.txt
View File

@ -8,10 +8,6 @@ include (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
CHECK_TYPE_SIZE(char SIZEOF_CHAR) CHECK_TYPE_SIZE(char SIZEOF_CHAR)
CHECK_TYPE_SIZE(short SIZEOF_SHORT) CHECK_TYPE_SIZE(short SIZEOF_SHORT)
include (CheckFunctionExists)
CHECK_FUNCTION_EXISTS(printf HAVE_PRINTF)
CHECK_FUNCTION_EXISTS(vsblabla HAVE_VSBLABLA)
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
CHECK_INCLUDE_FILE("sys/prctl.h" HAVE_SYS_PRCTL_H) CHECK_INCLUDE_FILE("sys/prctl.h" HAVE_SYS_PRCTL_H)

9
Tests/LoadCommandOneConfig/LoadedCommand.cxx.in
View File

@ -9,15 +9,6 @@ int testSizeOf(int s1, int s2)
int main () int main ()
{ {
int ret = 0; int ret = 0;
#ifdef HAVE_VSBLABLA
printf("Should not be able to find vsblabla\n");
ret = 1;
#endif
#if !defined( HAVE_PRINTF )
printf("Should be able to find printf\n");
ret= 1;
#endif
#if !defined( ADDED_DEFINITION ) #if !defined( ADDED_DEFINITION )
printf("Should have ADDED_DEFINITION defined\n"); printf("Should have ADDED_DEFINITION defined\n");

4
Tests/LoadCommandOneConfig/LoadedCommand.h.in
View File

@ -2,10 +2,6 @@
#cmakedefine SIZEOF_CHAR ${SIZEOF_CHAR} #cmakedefine SIZEOF_CHAR ${SIZEOF_CHAR}
#cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT} #cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT}
/* Check for functions */
#cmakedefine HAVE_PRINTF
#cmakedefine HAVE_VSBLABLA
/* Check for headers */ /* Check for headers */
#cmakedefine HAVE_SYS_PRCTL_H #cmakedefine HAVE_SYS_PRCTL_H