diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake index 5a1c83c2330d5a277c03ef8fbd73dbf6df003751..7db72f04a24e25c10514a988b618b7ed6b0a5819 100644 --- a/scripts/cmake/test/AddTest.cmake +++ b/scripts/cmake/test/AddTest.cmake @@ -217,6 +217,7 @@ function (AddTest) -DTESTER_COMMAND=${TESTER_COMMAND} -DVTKJS_CONVERTER=${VTKJS_CONVERTER} -DBINARY_PATH=${AddTest_BINARY_PATH} + -DVTKJS_OUTPUT_PATH=${CMAKE_SOURCE_DIR}/web/static/vis/${AddTest_PATH} "-DVIS_FILES=${AddTest_VIS}" -P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestTester.cmake ) diff --git a/scripts/cmake/test/AddTestTester.cmake b/scripts/cmake/test/AddTestTester.cmake index 6fdd3472fec13e2cac094eb1f92c76541f0edc04..551287479c34264afecfd7c79b5041c6602b07e9 100644 --- a/scripts/cmake/test/AddTestTester.cmake +++ b/scripts/cmake/test/AddTestTester.cmake @@ -19,8 +19,11 @@ if(NOT EXIT_CODE STREQUAL "0") endif() # Run vtk.js converter +if(VIS_FILES) + execute_process(COMMAND cmake -E make_directory ${VTKJS_OUTPUT_PATH}) +endif() foreach(FILE ${VIS_FILES}) execute_process( - COMMAND ${VTKJS_CONVERTER} -e -i ${BINARY_PATH}/${FILE} -o ${BINARY_PATH}/vtk-js + COMMAND ${VTKJS_CONVERTER} -e -i ${BINARY_PATH}/${FILE} -o ${VTKJS_OUTPUT_PATH} ) endforeach() diff --git a/web/.gitignore b/web/.gitignore index 46b8fa94a6fac0fa132f9c513b5513c90bf4afa1..4b6bd93e07e6610a60095d2636e93753417c4b8e 100644 --- a/web/.gitignore +++ b/web/.gitignore @@ -4,6 +4,9 @@ bin/ public/ themes/ogs/static import/secret.py +static/ +test.md +test.jpg # Generated from Contentful content/internal