Skip to content

Commit 6e542e6

Browse files
committed
test: log in as bash in the container tests
1 parent 97b09df commit 6e542e6

File tree

5 files changed

+50
-49
lines changed

5 files changed

+50
-49
lines changed

dev/docker/ci/tests/base.yml

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,60 @@ schemaVersion: 2.0.0
22

33
commandTests:
44
- name: cmake
5-
command: cmake
6-
args: ["--version"]
5+
command: bash
6+
args: ["-l", "-c", "cmake --version"]
77
expectedOutput: [".*3.*"]
88
- name: ninja
9-
command: /root/ninja/ninja
10-
args: ["--version"]
9+
command: bash
10+
args: ["-l", "-c", "ninja --version"]
1111
expectedOutput: [".*1.*"]
1212
- name: task
13-
command: task
14-
args: ["--version"]
13+
command: bash
14+
args: ["-l", "-c", "task --version"]
1515
expectedOutput: [".*Task version:\\s*v3.*"]
1616
- name: python
17-
command: python
18-
args: ["--version"]
17+
command: bash
18+
args: ["-l", "-c", "python --version"]
1919
expectedOutput: [".*Python.*"]
2020
- name: python3
21-
command: python3
22-
args: ["--version"]
21+
command: bash
22+
args: ["-l", "-c", "python3 --version"]
2323
expectedOutput: [".*Python.*"]
2424
- name: make
25-
command: make
26-
args: ["--version"]
25+
command: bash
26+
args: ["-l", "-c", "make --version"]
2727
expectedOutput: [".*GNU Make.*"]
2828
- name: cppcheck
29-
command: cppcheck
30-
args: ["--version"]
29+
command: bash
30+
args: ["-l", "-c", "cppcheck --version"]
3131
expectedOutput: [".*"]
3232
- name: gcovr
33-
command: gcovr
34-
args: ["--version"]
33+
command: bash
34+
args: ["-l", "-c", "gcovr --version"]
3535
expectedOutput: [".*gcovr.*"]
3636
- name: doxygen
37-
command: doxygen
38-
args: ["--version"]
37+
command: bash
38+
args: ["-l", "-c", "doxygen --version"]
3939
expectedOutput: [".*1.*"]
4040
- name: ccache
41-
command: ccache
42-
args: ["--version"]
41+
command: bash
42+
args: ["-l", "-c", "ccache --version"]
4343
expectedOutput: [".*"]
4444
- name: conan
45-
command: conan
46-
args: ["--version"]
45+
command: bash
46+
args: ["-l", "-c", "conan --version"]
4747
expectedOutput: [".*"]
4848
- name: meson
49-
command: meson
50-
args: ["--version"]
49+
command: bash
50+
args: ["-l", "-c", "meson --version"]
5151
expectedOutput: [".*"]
5252
- name: cmake-format
53-
command: cmake-format
54-
args: ["--version"]
53+
command: bash
54+
args: ["-l", "-c", "cmake-format --version"]
5555
expectedOutput: [".*"]
5656
- name: cmake-lint
57-
command: cmake-lint
58-
args: ["--version"]
57+
command: bash
58+
args: ["-l", "-c", "cmake-lint --version"]
5959
expectedOutput: [".*"]
6060

6161
fileExistenceTests:
@@ -68,3 +68,6 @@ fileExistenceTests:
6868
- name: "cmake"
6969
path: "/root/cmake"
7070
shouldExist: true
71+
- name: "task"
72+
path: "/root/task"
73+
shouldExist: true

dev/docker/ci/tests/gcc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ schemaVersion: 2.0.0
22

33
commandTests:
44
- name: gcc
5-
command: /usr/bin/gcc
6-
args: ["--version"]
5+
command: bash
6+
args: ["-l", "-c", "gcc --version"]
77
expectedOutput: [".*gcc.*"]
88
- name: g++
9-
command: /usr/bin/g++
10-
args: ["--version"]
11-
expectedOutput: [".*g++.*"]
9+
command: bash
10+
args: ["-l", "-c", "g++ --version"]
11+
expectedOutput: [".*g\\+\\+.*"]

dev/docker/ci/tests/index.mts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ async function main() {
1818
const result = await testDocker(variant, distro)
1919
if (result !== 0) {
2020
failed = true
21-
break
2221
}
2322
}
2423
}

dev/docker/ci/tests/llvm.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ schemaVersion: 2.0.0
22

33
commandTests:
44
- name: clang
5-
command: /usr/lib/llvm-19/bin/clang
6-
args: ["--version"]
7-
expectedOutput: [".*clang.*"]
8-
9-
fileExistenceTests:
10-
- name: "llvm"
11-
path: "/root/llvm"
12-
shouldExist: true
5+
command: bash
6+
args: ["-l", "-c", "clang --version"]
7+
expectedOutput: [".*clang version.*"]
8+
- name: clang++
9+
command: bash
10+
args: ["-l", "-c", "clang++ --version"]
11+
expectedOutput: [".*clang version.*"]

dev/docker/ci/tests/mingw.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ schemaVersion: 2.0.0
22

33
commandTests:
44
- name: mingw c compiler
5-
command: x86_64-w64-mingw32-gcc
6-
args: ["--version"]
5+
command: bash
6+
args: ["-l", "-c", "x86_64-w64-mingw32-gcc --version"]
77
expectedOutput: [".*x86_64-w64-mingw32-gcc.*"]
88
- name: mingw c++ compiler
9-
command: x86_64-w64-mingw32-g++
10-
args: ["--version"]
11-
expectedOutput: [".*x86_64-w64-mingw32-g\\+\\+*"]
9+
command: bash
10+
args: ["-l", "-c", "x86_64-w64-mingw32-g++ --version"]
11+
expectedOutput: [".*x86_64-w64-mingw32-g\\+\\+.*"]
1212
- name: powershell
13-
command: pwsh
14-
args: ["-Version"]
13+
command: bash
14+
args: ["-l", "-c", "pwsh --version"]
1515
expectedOutput: [".*PowerShell.*"]
1616

1717
fileExistenceTests:

0 commit comments

Comments
 (0)