Fixing Windows test failures

BlueQuartzSoftware · Jan 8, 2024 · cb5d852 · cb5d852
1 parent 0d7454a
commit cb5d852
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 33 deletions.
diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake
@@ -74,6 +74,7 @@ message(STATUS "* DREAM3D_DATA_DIR: ${DREAM3D_DATA_DIR}")
 message(STATUS "* -------------- Simplnx Python Configuration Options -------------------------------------")
 message(STATUS "* Pybind11 (${pybind11_VERSION}) ${pybind11_DIR}")
 message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
+message(STATUS "* PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
 message(STATUS "* SIMPLNX_BUILD_PYTHON: ${SIMPLNX_BUILD_PYTHON}")
 message(STATUS "* SIMPLNX_BUILD_PYTHON_DOCS: ${SIMPLNX_BUILD_PYTHON_DOCS}")
 message(STATUS "* SIMPLNX_BUILD_PYTHON_TESTS: ${SIMPLNX_BUILD_PYTHON_TESTS}")

diff --git a/cmake/Utility.cmake b/cmake/Utility.cmake
@@ -473,7 +473,7 @@ function(AddPythonTest)
   set(oneValueArgs NAME FILE)
   set(multiValueArgs PYTHONPATH)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-  message(STATUS "ARGS_FILE:${ARGS_FILE}")
+  # message(STATUS "ARGS_FILE:${ARGS_FILE}")
   if(SIMPLNX_BUILD_PYTHON)
     if(WIN32)
       add_test(NAME ${ARGS_NAME}

diff --git a/wrapping/python/CMakeLists.txt b/wrapping/python/CMakeLists.txt
@@ -284,20 +284,20 @@ endif()
 #------------------------------------------------------------------------------
 option(SIMPLNX_BUILD_PYTHON_TESTS "Enables python based unit tests" OFF)
 if(SIMPLNX_BUILD_PYTHON_TESTS)
-
-  set(DATA_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Data")
+
   get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
   if(is_multi_config)
-    set(DATA_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/Data")
+    set(CX_CONFIG_DIR "$<CONFIG>")
+  else()
+    set(CX_CONFIG_DIR ".")
   endif()
 
+  set(DATA_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CX_CONFIG_DIR}/Data")
+
   # Create a computer specific python file that defines the locations of various directories
   file(READ ${simplnx_SOURCE_DIR}/wrapping/python/testing/simplnx_test_dirs.in.py SIMPLNX_TEST_DIRS_FILE)
 
-  string(REPLACE "\${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" $<TARGET_FILE_DIR:simplnx> SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE})
-  string(REPLACE "\${simplnx_BINARY_DIR}" ${simplnx_BINARY_DIR} SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE})
-  string(REPLACE "\${DATA_DEST_DIR}" ${DATA_DEST_DIR} SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE})
-  string(REPLACE "\${simplnx_SOURCE_DIR}" ${simplnx_SOURCE_DIR} SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE})
+  string(CONFIGURE "${SIMPLNX_TEST_DIRS_FILE}" SIMPLNX_TEST_DIRS_FILE)
 
   file(GENERATE
     OUTPUT "$<TARGET_FILE_DIR:simplnx>/simplnx_test_dirs.py"

diff --git a/wrapping/python/docs/source/ReleaseNotes_120.rst b/wrapping/python/docs/source/ReleaseNotes_120.rst
@@ -24,46 +24,46 @@ Filter Changes 1.2.0
 +----------------------------------------+---------------------------------------+-----------+
 | Old File Name                          | New File Name                         | Type      |
 +========================================+=======================================+===========+
-| WriteAbaqusHexahedronFilter           | WriteAbaqusHexahedronFilter           | Filter    |
+| WriteAbaqusHexahedronFilter            | WriteAbaqusHexahedronFilter           | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| WriteAvizoRectilinearCoordinateFilter | WriteAvizoRectilinearCoordinateFilter | Filter    |
+| WriteAvizoRectilinearCoordinateFilter  | WriteAvizoRectilinearCoordinateFilter | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| WriteAvizoUniformCoordinateFilter     | WriteAvizoUniformCoordinateFilter     | Filter    |
+| WriteAvizoUniformCoordinateFilter      | WriteAvizoUniformCoordinateFilter     | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| WriteDREAM3DFilter                    | WriteDREAM3DFilter                    | Filter    |
+| WriteDREAM3DFilter                     | WriteDREAM3DFilter                    | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| WriteFeatureDataCSVFilter             | WriteFeatureDataCSVFilter             | Filter    |
+| WriteFeatureDataCSVFilter              | WriteFeatureDataCSVFilter             | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| ReadDeformKeyFileV12Filter           | ReadDeformKeyFileV12Filter            | Filter    |
+| ReadDeformKeyFileV12Filter             | ReadDeformKeyFileV12Filter            | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| ReadVolumeGraphicsFileFilter         | ReadVolumeGraphicsFileFilter          | Filter    |
+| ReadVolumeGraphicsFileFilter           | ReadVolumeGraphicsFileFilter          | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| ReadBinaryCTNorthstarFilter          | ReadBinaryCTNorthstarFilter           | Filter    |
+| ReadBinaryCTNorthstarFilter            | ReadBinaryCTNorthstarFilter           | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| WriteLosAlamosFFTFilter               | WriteLosAlamosFFTFilter               | Filter    |
+| WriteLosAlamosFFTFilter                | WriteLosAlamosFFTFilter               | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| ReadRawBinaryFilter                  | ReadRawBinaryFilter                   | Filter    |
+| ReadRawBinaryFilter                    | ReadRawBinaryFilter                   | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| ReadStlFileFilter                    | ReadStlFileFilter                     | Filter    |
+| ReadStlFileFilter                      | ReadStlFileFilter                     | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
-| WriteVtkRectilinearGridFilter         | WriteVtkRectilinearGridFilter         | Filter    |
+| WriteVtkRectilinearGridFilter          | WriteVtkRectilinearGridFilter         | Filter    |
 +----------------------------------------+---------------------------------------+-----------+
 
 - OrientationAnalysis
 
 +------------------------------+-----------------------------+-----------+
 | Old File Name                | New File Name               | Type      |
 +==============================+=============================+===========+
-| ReadEnsembleInfoFilter     | ReadEnsembleInfoFilter      | Filter    |
+| ReadEnsembleInfoFilter       | ReadEnsembleInfoFilter      | Filter    |
 +------------------------------+-----------------------------+-----------+
-| WriteGBCDGMTFileFilter      | WriteGBCDGMTFileFilter      | Filter    |
+| WriteGBCDGMTFileFilter       | WriteGBCDGMTFileFilter      | Filter    |
 +------------------------------+-----------------------------+-----------+
-| WriteGBCDTriangleDataFilter | WriteGBCDTriangleDataFilter | Filter    |
+| WriteGBCDTriangleDataFilter  | WriteGBCDTriangleDataFilter | Filter    |
 +------------------------------+-----------------------------+-----------+
-| ReadH5Data                 | ReadH5Data                  | Utility   |
+| ReadH5Data                   | ReadH5Data                  | Utility   |
 +------------------------------+-----------------------------+-----------+
-| ReadH5OimDataFilter        | ReadH5OimDataFilter         | Filter    |
+| ReadH5OimDataFilter          | ReadH5OimDataFilter         | Filter    |
 +------------------------------+-----------------------------+-----------+
-| WriteINLFileFilter              | WriteINLFileFilter          | Filter    |
+| WriteINLFileFilter           | WriteINLFileFilter          | Filter    |
 +------------------------------+-----------------------------+-----------+
 
diff --git a/wrapping/python/testing/anaconda_test.bat b/wrapping/python/testing/anaconda_test.bat
@@ -1,16 +1,17 @@
 @echo off
 
-echo "complex_CONDA_EXECUTABLE: %complex_CONDA_EXECUTABLE%"
-echo "complex_CONDA_ENV: %complex_CONDA_ENV%"
+:: echo "complex_CONDA_EXECUTABLE: %complex_CONDA_EXECUTABLE%"
+:: echo "complex_CONDA_ENV: %complex_CONDA_ENV%"
 echo "PYTHON_TEST_FILE: %PYTHON_TEST_FILE%"
 echo "PYTHONPATH: %PYTHONPATH%"
+echo "Python3_EXECUTABLE: %Python3_EXECUTABLE%"
 
-CALL "%complex_CONDA_EXECUTABLE%" activate "%complex_CONDA_ENV%"
+:: CALL "%complex_CONDA_EXECUTABLE%" activate "%complex_CONDA_ENV%"
 
 echo "PATH: %PATH%"
-echo "Where is Python: "
-where python
+:: echo "Where is Python: "
+:: where python.exe
 echo "Python Version: "
-python --version
+%Python3_EXECUTABLE% --version
 
-python "%PYTHON_TEST_FILE%"
+%Python3_EXECUTABLE% "%PYTHON_TEST_FILE%"