improve sanity checks

bedroge · Jun 25, 2024 · 3e65cdf · 3e65cdf
1 parent 2f87100
commit 3e65cdf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-37-GCCcore-11.3.0.eb
@@ -34,11 +34,14 @@ preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s',
-             'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-4-GCCcore-11.2.0.eb
@@ -34,11 +34,14 @@ preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s',
-             'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.0-53-GCCcore-12.2.0.eb
@@ -34,11 +34,14 @@ preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s',
-             'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-7.1.1-15-GCCcore-12.3.0.eb
@@ -33,10 +33,14 @@ preconfigopts = 'PKG_CONFIG=$EBROOTPKGCONF/bin/pkgconf'
 configopts = "--with-gslib --with-x"
 
 sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
+    'files': ['bin/magick'],
+    'dirs': ['etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
 }
 
+sanity_check_commands = [
+    'magick --help',
+]
+
 modextravars = {'MAGICK_HOME': '%(installdir)s'}
 
 moduleclass = 'vis'