diff options
author | Ken Martin <ken.martin@kitware.com> | 2006-07-21 14:26:05 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2006-07-21 14:26:05 (GMT) |
commit | 0189ce3424e15aaa82e61c7f05875062b8d25ca1 (patch) | |
tree | 0306464a01a008b4393d6849625cb4ec116ccb0e /Tests/LoadCommandOneConfig | |
parent | 8a357d9c8afc2bcc5d565eb935a2463252e77881 (diff) | |
download | CMake-0189ce3424e15aaa82e61c7f05875062b8d25ca1.zip CMake-0189ce3424e15aaa82e61c7f05875062b8d25ca1.tar.gz CMake-0189ce3424e15aaa82e61c7f05875062b8d25ca1.tar.bz2 |
ENH: increase coverage in a couple places
Diffstat (limited to 'Tests/LoadCommandOneConfig')
-rw-r--r-- | Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c | 34 | ||||
-rw-r--r-- | Tests/LoadCommandOneConfig/CMakeLists.txt | 6 |
2 files changed, 36 insertions, 4 deletions
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c index bd36b5c..c5ee611 100644 --- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c @@ -20,6 +20,9 @@ static int CCONV InitialPass(void *inf, void *mf, int argc, char *argv[]) char buffer[1024]; void *source_file; char *args[2]; + char *ccArgs[4]; + char *ccDep[1]; + char *ccOut[1]; cmLoadedCommandInfo *info = (cmLoadedCommandInfo *)inf; cmVTKWrapTclData *cdata = @@ -72,8 +75,6 @@ static int CCONV InitialPass(void *inf, void *mf, int argc, char *argv[]) info->CAPI->DisplaySatus(mf, str); info->CAPI->Free(str); - info->CAPI->Free(file); - info->CAPI->DisplaySatus(mf, info->CAPI->GetProjectName(mf)); info->CAPI->DisplaySatus(mf, info->CAPI->GetHomeDirectory(mf)); info->CAPI->DisplaySatus(mf, info->CAPI->GetHomeOutputDirectory(mf)); @@ -117,9 +118,36 @@ static int CCONV InitialPass(void *inf, void *mf, int argc, char *argv[]) info->CAPI->DestroySourceFile(source_file); - srcs = "LoadedCommand.cxx"; + srcs = argv[2]; info->CAPI->AddExecutable(mf,"LoadedCommand",1, &srcs, 0); + /* add customs commands to generate the source file */ + ccArgs[0] = "-E"; + ccArgs[1] = "copy"; + ccArgs[2] = argv[0]; + ccArgs[3] = argv[1]; + ccDep[0] = ccArgs[2]; + ccOut[0] = ccArgs[3]; + info->CAPI->AddCustomCommand(mf, "LoadedCommand.cxx", + file, + 4, ccArgs, + 1, ccDep, + 1, ccOut, + "LoadedCommand"); + + + ccArgs[2] = argv[1]; + ccArgs[3] = argv[2]; + ccDep[0] = ccArgs[2]; + ccOut[0] = ccArgs[3]; + info->CAPI->AddCustomCommandToOutput(mf, ccOut[0], + file, + 4, ccArgs, + ccDep[0], + 0, 0); + + info->CAPI->Free(file); + args[0] = "TEST_EXEC"; args[1] = "TRUE"; diff --git a/Tests/LoadCommandOneConfig/CMakeLists.txt b/Tests/LoadCommandOneConfig/CMakeLists.txt index 411d439..23a52a8 100644 --- a/Tests/LoadCommandOneConfig/CMakeLists.txt +++ b/Tests/LoadCommandOneConfig/CMakeLists.txt @@ -51,7 +51,11 @@ IF (COMPILE_OK) ) # if the command loaded, execute the command IF (COMMAND CMAKE_TEST_COMMAND) - CMAKE_TEST_COMMAND() + CMAKE_TEST_COMMAND( + "${LoadedCommand_SOURCE_DIR}/LoadedCommand.cxx" + "${LoadedCommand_BINARY_DIR}/LoadedCommand2.cxx" + "${LoadedCommand_BINARY_DIR}/LoadedCommand3.cxx" + ) ENDIF (COMMAND CMAKE_TEST_COMMAND) ELSE (COMPILE_OK) MESSAGE("failed to compile CMAKE_LOADED_COMMANDS") |