Fix COMPILER_OVERRIDE variables, C++ lint

LivInTheLookingGlass · Jul 19, 2024 · 37027d7 · 37027d7
1 parent 397a0eb
commit 37027d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/cplusplus.yml b/.github/workflows/cplusplus.yml
@@ -27,7 +27,7 @@ jobs:
         version: 1.0
 
     - name: Run tests
-      run: make cpp_lint
+      run: make cp_lint
 
   cpp:
     strategy:

diff --git a/c/test_euler.py b/c/test_euler.py
@@ -104,7 +104,11 @@
 compilers: List[str] = []
 
 if 'COMPILER_OVERRIDE' in environ:
-    compilers.extend(environ['COMPILER_OVERRIDE'].upper().split(','))
+    for comp in environ['COMPILER_OVERRIDE'].upper().split(','):
+        if comp in ('pcc', 'tcc'):
+            compilers.append(comp)
+        else:
+            compilers.extend(f'{comp}+{std}' for std in STANDARDS)
 else:
     if not (IN_TERMUX and GCC_BINARY == 'gcc') and which(GCC_BINARY):  # Termux maps gcc->clang
         compilers.extend(f'GCC+{std}' for std in STANDARDS)

diff --git a/cplusplus/test_euler.py b/cplusplus/test_euler.py
@@ -85,7 +85,8 @@
 compilers: List[str] = []
 
 if 'COMPILER_OVERRIDE' in environ:
-    compilers.extend(environ['COMPILER_OVERRIDE'].upper().split(','))
+    for comp in environ['COMPILER_OVERRIDE'].upper().split(','):
+        compilers.extend(f'{comp}+{std}' for std in STANDARDS)
 else:
     if not (IN_TERMUX and GCC_BINARY == 'g++') and which(GCC_BINARY):  # Termux maps gcc->clang
         compilers.extend(f'GCC+{std}' for std in STANDARDS)