Remove ^libxml2%gcc workaround in icon tests

C2SM · Aug 7, 2024 · ad0a4e9 · ad0a4e9
1 parent e4c2e6c
commit ad0a4e9
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/test/system_test.py b/test/system_test.py
@@ -84,7 +84,7 @@ def test_install_cosmo_eccodes_definitions_version(version):
 @pytest.mark.no_tsa
 @pytest.mark.cosmo
 def test_install_cosmo_6_0():
-    spack_install(f'[email protected]%nvhpc', test_root=False)
+    spack_install('[email protected]%nvhpc', test_root=False)
 
 
 @pytest.mark.eccodes
@@ -138,8 +138,7 @@ def test_install_icon_24_1_gcc():
 @pytest.mark.no_daint
 @pytest.mark.no_tsa  # Icon does not run on Tsa
 def test_install_2024_1_nvhpc():
-    #WORKAROUND: ^libxml2%gcc works around a problem in the concretizer of spack v0.21.1 and /mch-environment/v6
-    spack_install('icon @2024.1-1 %nvhpc ^libxml2%gcc')
+    spack_install('icon @2024.1-1 %nvhpc')
 
 
 @pytest.mark.no_daint  # libxml2 %nvhpc fails to build
@@ -155,9 +154,8 @@ def test_install_conditional_dependencies():
     # +mpi triggers mpi
     # gpu=openacc+cuda triggers cuda
 
-    #WORKAROUND: ^libxml2%gcc works around a problem in the concretizer of spack v0.21.1 and /mch-environment/v6
     spack_install(
-        'icon @2024.1-1 %nvhpc +coupling +rttov serialization=create +emvorado +mpi gpu=openacc+cuda ^libxml2%gcc'
+        'icon @2024.1-1 %nvhpc +coupling +rttov serialization=create +emvorado +mpi gpu=openacc+cuda cuda_arch=80'
     )