From e84d23185c638c3e2ae8d11f656088d69f10f041 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 7 Aug 2014 11:09:39 -0400 Subject: [PATCH] BUG: Fix ModuleDescriptionParser test data dir. Fixes Parser1Test{1,2}. Simplify by consolidation of variables. --- ModuleDescriptionParser/Testing/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ModuleDescriptionParser/Testing/CMakeLists.txt b/ModuleDescriptionParser/Testing/CMakeLists.txt index 2ce5206..8b40a64 100644 --- a/ModuleDescriptionParser/Testing/CMakeLists.txt +++ b/ModuleDescriptionParser/Testing/CMakeLists.txt @@ -1,7 +1,3 @@ - -# -------------------------------------------------------------------------- -set(INPUT ${CMAKE_CURRENT_SOURCE_DIR}/TestData) - # -------------------------------------------------------------------------- # Build tests # -------------------------------------------------------------------------- @@ -34,7 +30,7 @@ target_link_libraries(Parser1Test ModuleDescriptionParser ) # -------------------------------------------------------------------------- # Add tests # -------------------------------------------------------------------------- -set(TEST_DATA ${ModuleDescriptionParserTesting_SOURCE_DIR}/TestData) +set(TEST_DATA ${CMAKE_CURRENT_SOURCE_DIR}/TestData) add_test( NAME Parser1Test1 COMMAND ${Slicer_LAUNCH_COMMAND} $ ${TEST_DATA}/ParserTest1.xml @@ -46,7 +42,7 @@ add_test( add_test( NAME ModuleDescriptionTest - COMMAND ${Slicer_LAUNCH_COMMAND} $ ModuleDescriptionTest ${INPUT} + COMMAND ${Slicer_LAUNCH_COMMAND} $ ModuleDescriptionTest ${TEST_DATA} ) #add_test(