Skip to content

Commit 7f57dc8

Browse files
committed
clean up docker container tests
1 parent 9af0551 commit 7f57dc8

File tree

3 files changed

+13
-45
lines changed

3 files changed

+13
-45
lines changed

dev/docker/__tests__/arch.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
schemaVersion: 2.0.0
22

33
commandTests:
4-
- name: gcc compiler
5-
command: gcc
6-
args: ["--version"]
7-
expectedOutput: [".*gcc.*GCC.*"]
8-
- name: g++ compiler
9-
command: g++
10-
args: ["--version"]
11-
expectedOutput: [".*g\\+\\+.*GCC.*"]
12-
- name: make
13-
command: make
14-
args: ["--version"]
15-
expectedOutput: [".*GNU Make.*"]
164
- name: ninja
175
command: /root/ninja/ninja
186
args: ["--version"]
@@ -29,6 +17,10 @@ commandTests:
2917
command: doxygen
3018
args: ["--version"]
3119
expectedOutput: [".*1.*"]
20+
- name: clang
21+
command: /usr/lib/llvm-15/bin/clang
22+
args: ["--version"]
23+
expectedOutput: [".*clang.*"]
3224

3325
fileExistenceTests:
3426
- name: "vcpkg"

dev/docker/__tests__/fedora.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
schemaVersion: 2.0.0
22

33
commandTests:
4-
- name: gcc compiler
5-
command: gcc
6-
args: ["--version"]
7-
expectedOutput: [".*gcc.*GCC.*"]
8-
- name: g++ compiler
9-
command: g++
10-
args: ["--version"]
11-
expectedOutput: [".*g\\+\\+.*GCC.*"]
12-
- name: make
13-
command: make
14-
args: ["--version"]
15-
expectedOutput: [".*GNU Make.*"]
164
- name: ninja
175
command: /root/ninja/ninja
186
args: ["--version"]
@@ -29,6 +17,10 @@ commandTests:
2917
command: doxygen
3018
args: ["--version"]
3119
expectedOutput: [".*1.*"]
20+
- name: clang
21+
command: /usr/lib/llvm-15/bin/clang
22+
args: ["--version"]
23+
expectedOutput: [".*clang.*"]
3224

3325
fileExistenceTests:
3426
- name: "vcpkg"

dev/docker/__tests__/ubuntu.yml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,30 @@
11
schemaVersion: 2.0.0
22

33
commandTests:
4-
- name: gcc compiler
5-
command: gcc
6-
args: ["--version"]
7-
expectedOutput: [".*gcc.*"]
8-
- name: g++ compiler
9-
command: g++
10-
args: ["--version"]
11-
expectedOutput: [".*g\\+\\+.*"]
12-
- name: make
13-
command: make
14-
args: ["--version"]
15-
expectedOutput: [".*GNU Make.*"]
164
- name: ninja
175
command: /root/ninja/ninja
186
args: ["--version"]
197
expectedOutput: [".*1.*"]
208
- name: gcovr
21-
command: gcovr
9+
command: /usr/local/bin/gcovr
2210
args: ["--version"]
2311
expectedOutput: [".*gcovr.*"]
2412
- name: ccache
25-
command: ccache
13+
command: /usr/bin/ccache
2614
args: ["--version"]
2715
expectedOutput: [".*ccache.*"]
2816
- name: doxygen
29-
command: doxygen
17+
command: /usr/bin/doxygen
3018
args: ["--version"]
3119
expectedOutput: [".*1.*"]
3220
- name: cppcheck
33-
command: cppcheck
21+
command: /usr/bin/cppcheck
3422
args: ["--version"]
3523
expectedOutput: [".*Cppcheck.*"]
3624
- name: clang
37-
command: /root/llvm/bin/clang
25+
command: /usr/lib/llvm-15/bin/clang
3826
args: ["--version"]
3927
expectedOutput: [".*clang.*"]
40-
- name: node
41-
command: node
42-
args: ["-v"]
43-
expectedOutput: [".*v12.*"]
4428

4529
fileExistenceTests:
4630
- name: "vcpkg"

0 commit comments

Comments
 (0)