spack audit externals: allow selecting platforms and checking extra attributes (#43782)

6 files changed, 28 insertions, 0 deletions

diff --git a/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml b/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml
index dc5b7106ec..dffdf88286 100644
--- a/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml
+++ b/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml
@@ -9,6 +9,7 @@ paths:
           echo "Target: x86_64-apple-darwin19.5.0"
           echo "Thread model: posix"
           echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin"
+    platforms: ["darwin"]
     results:
       - spec: 'apple-clang@11.0.0'
   # Apple Clang on Apple M1 (Ventura)
@@ -21,6 +22,7 @@ paths:
           echo "Target: arm64-apple-darwin22.6.0"
           echo "Thread model: posix"
           echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin"
+    platforms: ["darwin"]
     results:
       - spec: 'apple-clang@15.0.0'
   # Test that missing a compiler prevents the package from being detected
@@ -32,4 +34,5 @@ paths:
           echo "Target: x86_64-apple-darwin19.5.0"
           echo "Thread model: posix"
           echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin"
+    platforms: ["darwin"]
     results: [ ]
diff --git a/var/spack/repos/builtin/packages/gcc/detection_test.yaml b/var/spack/repos/builtin/packages/gcc/detection_test.yaml
index a7a9e55cd1..cdce43196e 100644
--- a/var/spack/repos/builtin/packages/gcc/detection_test.yaml
+++ b/var/spack/repos/builtin/packages/gcc/detection_test.yaml
@@ -20,8 +20,13 @@ paths:
             echo "mock executable got an unexpected flag: $1"
             exit 1
           fi
+    platforms: ["darwin", "linux"]
     results:
       - spec: "gcc@9.4.0 languages=c,c++"
+        extra_attributes:
+          compilers:
+            c: ".*/bin/gcc"
+            cxx: ".*/bin/g++"
   # Mock a version < 7 of GCC that requires -dumpversion and
   # errors with -dumpfullversion
   - layout:
@@ -37,8 +42,14 @@ paths:
             echo "compilation terminated."
             exit 1
           fi
+    platforms: ["darwin", "linux"]
     results:
       - spec: "gcc@5.5.0 languages=c,c++,fortran"
+        extra_attributes:
+          compilers:
+            c: ".*/bin/gcc-5$"
+            cxx: ".*/bin/g[+][+]-5$"
+            fortran: ".*/bin/gfortran-5$"
   # Multiple compilers present at the same time
   - layout:
       - executables:
@@ -50,7 +61,14 @@ paths:
         script: "echo 10.1.0"
     results:
       - spec: "gcc@6.5.0 languages=c"
+        extra_attributes:
+          compilers:
+            c: ".*/bin/x86_64-linux-gnu-gcc-6$"
       - spec: "gcc@10.1.0 languages=c,c++"
+        extra_attributes:
+          compilers:
+            c: ".*/bin/x86_64-linux-gnu-gcc-10$"
+            cxx: ".*/bin/x86_64-linux-gnu-g[+][+]-10$"
   # Apple clang under disguise as gcc should not be detected
   - layout:
       - executables:
@@ -70,4 +88,5 @@ paths:
             echo "mock executable got an unexpected flag: $1"
             exit 1
           fi
+    platforms: ["darwin"]
     results: []
diff --git a/var/spack/repos/builtin/packages/intel/detection_test.yaml b/var/spack/repos/builtin/packages/intel/detection_test.yaml
index 076bfeaaba..1a0e23b82c 100644
--- a/var/spack/repos/builtin/packages/intel/detection_test.yaml
+++ b/var/spack/repos/builtin/packages/intel/detection_test.yaml
@@ -15,5 +15,6 @@ paths:
         script: |
           echo "ifort (IFORT) 18.0.5 20180823"
           echo "Copyright (C) 1985-2018 Intel Corporation.  All rights reserved."
+    platforms: ["darwin", "linux"]
     results:
       - spec: 'intel@18.0.5'
diff --git a/var/spack/repos/builtin/packages/llvm/detection_test.yaml b/var/spack/repos/builtin/packages/llvm/detection_test.yaml
index 48e9d6751a..a5719fb395 100644
--- a/var/spack/repos/builtin/packages/llvm/detection_test.yaml
+++ b/var/spack/repos/builtin/packages/llvm/detection_test.yaml
@@ -14,6 +14,7 @@ paths:
           echo "Target: x86_64-pc-linux-gnu"
           echo "Thread model: posix"
           echo "InstalledDir: /usr/bin"
+    platforms: ["darwin", "linux"]
     results:
       - spec: 'llvm@3.9.1 +clang~lld~lldb'
   # Multiple LLVM packages in the same prefix
@@ -40,6 +41,7 @@ paths:
           echo "Target: x86_64-pc-linux-gnu"
           echo "Thread model: posix"
           echo "InstalledDir: /usr/bin"
+    platforms: ["darwin", "linux"]
     results:
       - spec: 'llvm@8.0.0+clang+lld+lldb'
       - spec: 'llvm@3.9.1+clang~lld~lldb'
@@ -53,4 +55,5 @@ paths:
         echo "Target: x86_64-apple-darwin19.5.0"
         echo "Thread model: posix"
         echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin"
+    platforms: ["darwin"]
     results: []
diff --git a/var/spack/repos/builtin/packages/xlc/detection_test.yaml b/var/spack/repos/builtin/packages/xlc/detection_test.yaml
index e76c608aba..5bc2c1f13b 100644
--- a/var/spack/repos/builtin/packages/xlc/detection_test.yaml
+++ b/var/spack/repos/builtin/packages/xlc/detection_test.yaml
@@ -13,6 +13,7 @@ paths:
         script: |
           echo "IBM XL Fortran for Linux, V16.1.1 (5725-C73, 5765-J13)"
           echo "Version: 16.01.0001.0006"
+    platforms: ["linux"]
     results:
       - spec: "xlc+r@16.1"
       - spec: "xlc~r@16.1"
diff --git a/var/spack/repos/builtin/packages/xlf/detection_test.yaml b/var/spack/repos/builtin/packages/xlf/detection_test.yaml
index 461ef007d7..1ba6955a94 100644
--- a/var/spack/repos/builtin/packages/xlf/detection_test.yaml
+++ b/var/spack/repos/builtin/packages/xlf/detection_test.yaml
@@ -6,6 +6,7 @@ paths:
         script: |
           echo "IBM XL Fortran for Linux, V16.1.1 (5725-C73, 5765-J13)"
           echo "Version: 16.01.0001.0006"
+    platforms: ["linux"]
     results:
       - spec: "xlf+r@16.1"
       - spec: "xlf~r@16.1"