Skip to content

Commit

Permalink
Remove bash dependency for tests
Browse files Browse the repository at this point in the history
No tests requires bash and can be executed with sh
  • Loading branch information
diizzyy committed Aug 31, 2024
1 parent a279d13 commit 742fc31
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ if(BUILD_APPS)
)
endif()

find_program(BASH_EXECUTABLE bash)
if(BASH_EXECUTABLE)
find_program(SH_EXECUTABLE sh)
if(SH_EXECUTABLE)
set(BUILD_TESTING ON CACHE BOOL "")
else()
message(STATUS "WARNING: bash not available so disabling testing")
Expand Down
2 changes: 1 addition & 1 deletion cmake/contrib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if(BUILD_SHAPELIB_CONTRIB)
add_test(
NAME contrib
COMMAND
${BASH_EXECUTABLE} ${PROJECT_SOURCE_DIR}/contrib/tests/shpproj.sh ${PROJECT_SOURCE_DIR}/contrib/tests/expect.out
${SH_EXECUTABLE} ${PROJECT_SOURCE_DIR}/contrib/tests/shpproj.sh ${PROJECT_SOURCE_DIR}/contrib/tests/expect.out
)
declare_test_executable(contrib "dbfadd;dbfcreate;shpadd;shpcreate;shpdump")
endif()
Expand Down

0 comments on commit 742fc31

Please sign in to comment.