remove valgrind from ctest

michaeldsmith · Jul 19, 2022 · 281565c · 281565c
1 parent 4c98769
commit 281565c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -23,9 +23,6 @@ jobs:
 
     steps:
 
-    - name: install dependencies
-      run: sudo apt-get -y install valgrind
-
     - uses: actions/checkout@v3
 
     - name: Configure CMake
@@ -45,9 +42,6 @@ jobs:
 
     steps:
 
-    - name: install dependencies
-      run: sudo apt-get -y install valgrind
-
     - uses: actions/checkout@v3
 
     - name: Configure CMake
@@ -59,11 +53,11 @@ jobs:
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-    #- name: Test
-    #  working-directory: ${{github.workspace}}/build
-    #  # Execute tests defined by the CMake configuration.  
-    #  # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-    #  run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}
 
   valgrind:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ add_subdirectory(doc)
 add_subdirectory(lib)
 add_subdirectory(ctlrender)
 add_subdirectory(OpenEXR_CTL)
-# add_subdirectory(unittest EXCLUDE_FROM_ALL)
+#add_subdirectory(unittest EXCLUDE_FROM_ALL)
 add_subdirectory(unittest)
 
 # Add all targets to the build-tree export set
@@ -91,11 +91,11 @@ install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION
 # add tests
 enable_testing()
 # valgrind
-find_program(BASH_PROGRAM bash)
-if (BASH_PROGRAM)
-  find_program(VALGRIND_PROGRAM valgrind)
-  if (VALGRIND_PROGRAM)
-    add_test("valgrind-test" ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/unittest/scripts/run_valgrind.sh)
-  endif (VALGRIND_PROGRAM)
-endif (BASH_PROGRAM)
+#find_program(BASH_PROGRAM bash)
+#if (BASH_PROGRAM)
+#  find_program(VALGRIND_PROGRAM valgrind)
+#  if (VALGRIND_PROGRAM)
+#    add_test("valgrind-test" ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/unittest/scripts/run_valgrind.sh)
+#  endif (VALGRIND_PROGRAM)
+#endif (BASH_PROGRAM)
 
diff --git a/Dockerfile b/Dockerfile
@@ -9,13 +9,15 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y install cmake
 RUN apt-get -y install g++
 RUN apt-get -y install valgrind
-RUN apt-get -y install nano
 
 # install CTL dependencies
 RUN apt-get -y install libilmbase-dev
 RUN apt-get -y install libopenexr-dev
 RUN apt-get -y install libtiff-dev
 
+# install utilities for convenience, not needed for CTL
+RUN apt-get -y install nano
+
 # build CTL
 WORKDIR /usr/src/CTL
 COPY . .