Skip to content

Commit 2ae0851

Browse files
guitargeekmaxgalli
authored andcommitted
[ci] Run ctests from the correct directory
This fixes the problem that no tests were found for the LCG and conda builds.
1 parent aebce21 commit 2ae0851

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ jobs:
7272
combine --help > /dev/null
7373
text2workspace.py --help > /dev/null
7474
ulimit -s unlimited;
75-
ctest --test-dir build --output-on-failure
75+
ctest --test-dir build/test --output-on-failure

.github/workflows/cvmfs-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
run: >-
111111
source /cvmfs/sft.cern.ch/lcg/views/${LCG_RELEASE}/${LCG_ARCH}/setup.sh;
112112
ulimit -s unlimited;
113-
ctest --test-dir build --output-on-failure -j$(nproc);
113+
ctest --test-dir build/test --output-on-failure -j$(nproc);
114114
115115
# AlmaLinux 9 job
116116
- uses: ./.github/actions/run-in-cvmfs

test/CombineTestMacros.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ function(COMBINE_ADD_TEST test)
4242
find_program(_exe ${_prg})
4343
if(_exe) # if the command is found in the system, use it
4444
set(_cmd ${_exe} ${ARG_COMMAND})
45-
elseif(NOT IS_ABSOLUTE ${_prg}) # if not absolute, assume is found in current binary dir
46-
set(_prg ${CMAKE_CURRENT_BINARY_DIR}/${_prg})
47-
set(_cmd ${_prg} ${ARG_COMMAND})
4845
else() # take as it is
4946
set(_cmd ${_prg} ${ARG_COMMAND})
5047
endif()

0 commit comments

Comments
 (0)