Browse Source

Merge topic 'remove-failing-modules-test'

0301a76bb4 FindEnvMod: Remove unreliable test case

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3823
Brad King 6 years ago
parent
commit
35b580d603
1 changed files with 7 additions and 9 deletions
  1. 7 9
      Tests/FindEnvModules/EnvModules.cmake

+ 7 - 9
Tests/FindEnvModules/EnvModules.cmake

@@ -18,18 +18,16 @@ if(avail_mods)
 
   message("module list")
   env_module_list(loaded_mods)
+  set(mod0_found FALSE)
   foreach(mod IN LISTS loaded_mods)
     message("  ${mod}")
+    if(NOT mod0_found AND mod MATCHES "^${mod0}")
+      set(mod0_found ${mod})
+    endif()
   endforeach()
 
-  list(LENGTH loaded_mods num_loaded_mods)
-  message("Number of modules loaded: ${num_loaded_mods}")
-  if(NOT num_loaded_mods EQUAL 1)
-    message(FATAL_ERROR "Exactly 1 module should be loaded.  Found ${num_loaded_mods}")
-  endif()
-
-  list(GET loaded_mods 0 mod0_actual)
-  if(NOT (mod0_actual MATCHES "^${mod0}"))
-    message(FATAL_ERROR "Loaded module does not match ${mod0}.  Actual: ${mod0_actual}")
+  if(NOT mod0_found)
+    message(FATAL_ERROR "Requested module ${mod0} not found in loaded modules")
   endif()
+  message("module ${mod0} found loaded as ${mod0_found}")
 endif()