#97: update ci scripts

DARMA-tasking · Sep 4, 2024 · c066ead · c066ead
1 parent 34275ac
commit c066ead
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml
@@ -211,14 +211,14 @@ jobs:
           export VTK_DIR=${{ env.VTK_BUILD_DIR }}
           export PYTHON_VERSIONS=${{ join(matrix.host.python) }}
 
-      - name: Build Python bindings (${{ join(matrix.host.python, ', ') }})
+      - name: Build Python package (${{ join(matrix.host.python, ', ') }})
         run: |
           cd ${{ github.workspace }}
           chmod +x ./ci/python_build.sh
 
           for python_version in "${PYTHON_VERSIONS[@]}"
           do
-            echo "::group::Build Python Bindings (${python_version})"
+            echo "::group::Build Python package (${python_version})"
             CONDA_PATH=${{ env.CONDA_PATH }} VT_TV_CONDA_ENV=py${python_version} ./ci/python_build.sh
             echo "::endgroup::"
           done

diff --git a/ci/python_test.sh b/ci/python_test.sh
@@ -12,16 +12,16 @@ CURRENT_DIR="$(dirname -- "$(realpath -- "$0")")"
 # Activate conda environment
 . ${CONDA_PATH}/etc/profile.d/conda.sh && conda activate $VT_TV_CONDA_ENV
 
-# Start virtual display
+# Start virtual display (Linux)
 CURRENT_DISPLAY=$(echo $DISPLAY)
-if [ "$(echo  $(uname -a))" != *"Darwin"* ]; then
+if [[ $(uname -a) != *"Darwin"* ]]; then
     $CURRENT_DIR/xvfb_start.sh :99
 fi
 
 # Run test
 python /opt/src/vt-tv/tests/test_bindings.py
 
 # Restore display
-if [ "$(echo  $(uname -a))" != *"Darwin"* ]; then
+if [[ $(uname -a) != *"Darwin"* ]]; then
     $CURRENT_DIR/xvfb_stop.sh :99 $CURRENT_DISPLAY
 fi
diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -14,7 +14,7 @@ VT_TV_TESTS_OUTPUT_DIR=${VT_TV_TESTS_OUTPUT_DIR:-"$VT_TV_OUTPUT_DIR/tests"}
 
 # Start virtual display
 CURRENT_DISPLAY=$(echo $DISPLAY)
-if [ "$(echo  $(uname -a))" != *"Darwin"* ]; then
+if [[ $(uname -a) != *"Darwin"* ]]; then
     $CURRENT_DIR/xvfb_start.sh :99
 fi
 
@@ -28,7 +28,7 @@ bash -c "VTK_DIR=/opt/build/vtk \
     $VT_TV_SRC_DIR/build.sh"
 
 # Restore display
-if [ "$(echo  $(uname -a))" != *"Darwin"* ]; then
+if [[ $(uname -a) != *"Darwin"* ]]; then
     $CURRENT_DIR/xvfb_stop.sh :99 $CURRENT_DISPLAY
 fi
 

diff --git a/tests/unit/render/test_render.cc b/tests/unit/render/test_render.cc
@@ -148,9 +148,9 @@ class RenderTest :public ::testing::TestWithParam<std::string> {
 
   void assertPolyEquals(vtkPolyData *actual, vtkPolyData *expected) {
     // fmt::print("Actual vtkPolyData:\n");
-    printVtkPolyData(actual);
+    // printVtkPolyData(actual);
     // fmt::print("Expected vtkPolyData:\n");
-    printVtkPolyData(expected);
+    // printVtkPolyData(expected);
 
     // Assertions required to test vt-tv meshaes
     // Number of point data should be ranks