Skip to content

Commit 9acc3af

Browse files
authored
Merge pull request #2068 from Idclip/ax_gtest
Replace CppUnit with GoogleTest in AX tests
2 parents 313af9a + 92ea388 commit 9acc3af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3329
-4791
lines changed

.github/workflows/houdini.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ jobs:
9191
- name: glfw
9292
if: contains(matrix.config.image, '2023') == true
9393
run: ./ci/install_glfw.sh 3.3.10
94-
- name: cppunit
95-
run: ./ci/install_cppunit.sh 1.15.1
9694
- name: install_gtest
9795
run: ./ci/install_gtest.sh 1.15.2
9896
- name: timestamp

.github/workflows/weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ jobs:
407407
shell: powershell
408408
run: |
409409
vcpkg update
410-
vcpkg install tbb cppunit
410+
vcpkg install tbb gtest
411411
- name: build
412412
run: >
413413
./ci/build.sh -v

ci/install_macos.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ LLVM_VERSION=$1
4545
if [ ! -z "$LLVM_VERSION" ]; then
4646
if [ "$LLVM_VERSION" == "latest" ]; then
4747
brew install llvm
48-
brew install cppunit
4948
else
5049
brew install llvm@$LLVM_VERSION
51-
brew install cppunit
5250
fi
5351
fi

cmake/FindCppUnit.cmake

Lines changed: 0 additions & 320 deletions
This file was deleted.

doc/build.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ CMake | Cross-platform family of tools designed to help build software
257257
C++17 Compiler | Matching Houdini compiler and version | All |
258258
Boost | Components: iostreams | All |
259259
GoogleTest | A unit testing framework module for C++ | Unit Tests |
260-
CppUnit | A unit testing framework module for C++ | Unit Tests (AX) |
261260
GLFW | Simple API for OpenGL development | OpenVDB View |
262261
Doxygen | Documentation generation from C++ | Documentation |
263262
Log4cplus | An optional dependency for improved OpenVDB Logging | Optional (All) |
@@ -349,7 +348,6 @@ Boost | Components: iostreams
349348
ZLIB | Compression library for disk serialization compression | All |
350349
Blosc | Recommended dependency for improved disk compression | All* |
351350
GoogleTest | A unit testing framework module for C++ | Unit Tests |
352-
CppUnit | A unit testing framework module for C++ | Unit Tests (AX) |
353351
GLFW | Simple API for OpenGL development | OpenVDB View |
354352
Doxygen | Documentation generation from C++ | Documentation |
355353
OpenEXR | EXR serialization support | OpenVDB Render |

0 commit comments

Comments
 (0)