Skip to content
Permalink
Browse files

Use generic terms in the CTest template files.

Do not reference DREAM3D variables so that Plugins can use this same infrastructure

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
  • Loading branch information...
imikejackson committed May 19, 2019
1 parent 1a801f8 commit 3d507049d6add9edb7f52ec0100ed9790f56577f
@@ -142,7 +142,7 @@
"Filter_Human_Label": "Write DREAM.3D Data File",
"Filter_Name": "DataContainerWriter",
"Filter_Uuid": "{3fcd4c43-9d75-5b86-aad4-4441bc914f37}",
"OutputFile": "Output/Examples/ExtractVertexGeometry.dream3d",
"OutputFile": "Data/Output/Examples/ExtractVertexGeometry.dream3d",
"WriteTimeSeries": 0,
"WriteXdmfFile": 1
},
@@ -104,23 +104,6 @@ if(SIMPL_USE_ITK)
)
endif()


# configure_file(${DREAM3DTest_SOURCE_DIR}/PipelineRunnerTest.h.in
# ${DREAM3DTest_BINARY_DIR}/PipelineRunnerTest.h)

# add_executable(PipelineRunnerTest
# ${DREAM3DTest_SOURCE_DIR}/PipelineRunnerTest.cpp ${DREAM3DTest_BINARY_DIR}/PipelineRunnerTest.h)
# target_include_directories(PipelineRunnerTest
# PUBLIC
# ${DREAM3DTest_BINARY_DIR}
# ${SIMPLProj_SOURCE_DIR}/Source
# ${SIMPLProj_BINARY_DIR})
# target_link_libraries(PipelineRunnerTest Qt5::Core EbsdLib SIMPLib)
# set_target_properties(PipelineRunnerTest PROPERTIES FOLDER "DREAM3D UnitTests")
# add_test(NAME PipelineRunnerTest
# COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/PipelineRunnerTest
# WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

FILE(WRITE ${TEST_PIPELINE_LIST_FILE} )


@@ -130,11 +113,11 @@ if(WIN32)
set(TEST_SCRIPT_FILE_EXT "bat")
set(EXE_EXT ".exe")
endif()

set(PREBUILT_SUPPORT_DIR "${DREAM3D_SUPPORT_DIR}")
set(test_index "0")
foreach(test ${PREBUILT_PIPELINE_NAMES} )
set(DREAM3D_PIPELINE_FILE "${DREAM3D_SUPPORT_DIR}/${PREBUILT_PIPELINES_DIR}/${test}.json")
FILE(APPEND ${TEST_PIPELINE_LIST_FILE} "${DREAM3D_PIPELINE_FILE}\n")
set(Example_PIPELINE_FILE "${DREAM3D_SUPPORT_DIR}/${test}.json")
FILE(APPEND ${TEST_PIPELINE_LIST_FILE} "${Example_PIPELINE_FILE}\n")

#----------------
set(SIMPL_CTEST_TEST_DRIVER "${DREAM3DTest_BINARY_DIR}/PrebuiltPipelineTests/${test}.${TEST_SCRIPT_FILE_EXT}")
@@ -150,7 +133,6 @@ set(PREBUILT_PIPELINES_DIR "TestPipelines")
set(TEST_PIPELINE_LIST_FILE ${DREAM3DTest_BINARY_DIR}/PipelineRunnerTest.txt)
set(TEST_DATA_DIR ${DREAM3D_DATA_DIR})
set(PREBUILT_PIPELINE_NAMES

)

foreach(f ${PREBUILT_PIPELINE_NAMES} )
@@ -33,10 +33,11 @@ IF "@CMAKE_BUILD_TYPE@" == "Release" (
)

echo on
@echo "[@test@.json] Prebuilt Pipeline Test Starting"
@echo "Prebuilt Pipeline Test Starting"
@echo " @test@.json"

@echo "Running Executable at @CMAKE_RUNTIME_OUTPUT_DIRECTORY@\%CONFIG_DIR%\PipelineRunner%EXE_SFX%@EXE_EXT@"

cd @CMAKE_RUNTIME_OUTPUT_DIRECTORY@\%CONFIG_DIR%

PipelineRunner%EXE_SFX%@EXE_EXT@ --pipeline "@DREAM3D_SUPPORT_DIR@/@test@.json"
PipelineRunner%EXE_SFX%@EXE_EXT@ --pipeline "@Example_PIPELINE_FILE@"
@@ -2,15 +2,16 @@

#set -e

echo "[@test@.json] Prebuilt Pipeline Test Starting"
echo "Prebuilt Pipeline Test Starting"
echo " @test@.json"

DEBUG_EXT=""
if [ "@BUILD_TYPE@" = "Debug" ]; then
DEBUG_EXT="@EXE_DEBUG_EXTENSION@"
fi

cd "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@"
"./PipelineRunner${DEBUG_EXT}" --pipeline "@DREAM3D_SUPPORT_DIR@/@test@.json"
"./PipelineRunner${DEBUG_EXT}" --pipeline "@Example_PIPELINE_FILE@"

if [ $? -eq 0 ]
then

0 comments on commit 3d50704

Please sign in to comment.
You can’t perform that action at this time.