From 7f57dc837b64fc22b2e6b20e1fcbc9b7a72cb105 Mon Sep 17 00:00:00 2001 From: abeimler Date: Thu, 20 Jul 2023 14:04:10 +0200 Subject: [PATCH] clean up docker container tests --- dev/docker/__tests__/arch.yml | 16 ++++------------ dev/docker/__tests__/fedora.yml | 16 ++++------------ dev/docker/__tests__/ubuntu.yml | 26 +++++--------------------- 3 files changed, 13 insertions(+), 45 deletions(-) diff --git a/dev/docker/__tests__/arch.yml b/dev/docker/__tests__/arch.yml index 8f7074d1..886ca439 100644 --- a/dev/docker/__tests__/arch.yml +++ b/dev/docker/__tests__/arch.yml @@ -1,18 +1,6 @@ schemaVersion: 2.0.0 commandTests: - - name: gcc compiler - command: gcc - args: ["--version"] - expectedOutput: [".*gcc.*GCC.*"] - - name: g++ compiler - command: g++ - args: ["--version"] - expectedOutput: [".*g\\+\\+.*GCC.*"] - - name: make - command: make - args: ["--version"] - expectedOutput: [".*GNU Make.*"] - name: ninja command: /root/ninja/ninja args: ["--version"] @@ -29,6 +17,10 @@ commandTests: command: doxygen args: ["--version"] expectedOutput: [".*1.*"] + - name: clang + command: /usr/lib/llvm-15/bin/clang + args: ["--version"] + expectedOutput: [".*clang.*"] fileExistenceTests: - name: "vcpkg" diff --git a/dev/docker/__tests__/fedora.yml b/dev/docker/__tests__/fedora.yml index 8f7074d1..886ca439 100644 --- a/dev/docker/__tests__/fedora.yml +++ b/dev/docker/__tests__/fedora.yml @@ -1,18 +1,6 @@ schemaVersion: 2.0.0 commandTests: - - name: gcc compiler - command: gcc - args: ["--version"] - expectedOutput: [".*gcc.*GCC.*"] - - name: g++ compiler - command: g++ - args: ["--version"] - expectedOutput: [".*g\\+\\+.*GCC.*"] - - name: make - command: make - args: ["--version"] - expectedOutput: [".*GNU Make.*"] - name: ninja command: /root/ninja/ninja args: ["--version"] @@ -29,6 +17,10 @@ commandTests: command: doxygen args: ["--version"] expectedOutput: [".*1.*"] + - name: clang + command: /usr/lib/llvm-15/bin/clang + args: ["--version"] + expectedOutput: [".*clang.*"] fileExistenceTests: - name: "vcpkg" diff --git a/dev/docker/__tests__/ubuntu.yml b/dev/docker/__tests__/ubuntu.yml index 36390e18..05e7d10e 100644 --- a/dev/docker/__tests__/ubuntu.yml +++ b/dev/docker/__tests__/ubuntu.yml @@ -1,46 +1,30 @@ schemaVersion: 2.0.0 commandTests: - - name: gcc compiler - command: gcc - args: ["--version"] - expectedOutput: [".*gcc.*"] - - name: g++ compiler - command: g++ - args: ["--version"] - expectedOutput: [".*g\\+\\+.*"] - - name: make - command: make - args: ["--version"] - expectedOutput: [".*GNU Make.*"] - name: ninja command: /root/ninja/ninja args: ["--version"] expectedOutput: [".*1.*"] - name: gcovr - command: gcovr + command: /usr/local/bin/gcovr args: ["--version"] expectedOutput: [".*gcovr.*"] - name: ccache - command: ccache + command: /usr/bin/ccache args: ["--version"] expectedOutput: [".*ccache.*"] - name: doxygen - command: doxygen + command: /usr/bin/doxygen args: ["--version"] expectedOutput: [".*1.*"] - name: cppcheck - command: cppcheck + command: /usr/bin/cppcheck args: ["--version"] expectedOutput: [".*Cppcheck.*"] - name: clang - command: /root/llvm/bin/clang + command: /usr/lib/llvm-15/bin/clang args: ["--version"] expectedOutput: [".*clang.*"] - - name: node - command: node - args: ["-v"] - expectedOutput: [".*v12.*"] fileExistenceTests: - name: "vcpkg"