ts: use cmake EVAL CODE in install_test_cmake

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

testsuite/bin/install_test_cmake

@@ -28,7 +28,7 @@ include(${initfile})
 
 # execute command list
 set(code 0)
-set(runml 0)
+set(func "module")
 string(REPLACE ":" ";" cmdsplit "${cmdlist}")
 # empty command list, means one empty command
 list (LENGTH cmdlist cmdcnt)
@@ -38,70 +38,26 @@ else()
    foreach(cmd ${cmdsplit})
       # call ml procedure instead of module
       if("${cmd}" STREQUAL "ml")
-         set(runml 1)
-      # if command equals to NOARG string, means call with no arg passed
-      elseif("${cmd}" STREQUAL "NOARG")
-         if (${runml} EQUAL 0)
-            module()
-         else()
-            ml()
-         endif()
+         set(func "ml")
       else()
-         string(REPLACE "," ";" cmdelt "${cmd}")
-         list (LENGTH cmdelt eltcnt)
-         if(${eltcnt} GREATER 4)
-            list(GET cmdelt 0 elt0)
-            list(GET cmdelt 1 elt1)
-            list(GET cmdelt 2 elt2)
-            list(GET cmdelt 3 elt3)
-            list(GET cmdelt 4 elt4)
-            if (${runml} EQUAL 0)
-               module("${elt0}" "${elt1}" "${elt2}" "${elt3}" "${elt4}")
-            else()
-               ml("${elt0}" "${elt1}" "${elt2}" "${elt3}" "${elt4}")
-            endif()
-         elseif(${eltcnt} GREATER 3)
-            list(GET cmdelt 0 elt0)
-            list(GET cmdelt 1 elt1)
-            list(GET cmdelt 2 elt2)
-            list(GET cmdelt 3 elt3)
-            if (${runml} EQUAL 0)
-               module("${elt0}" "${elt1}" "${elt2}" "${elt3}")
-            else()
-               ml("${elt0}" "${elt1}" "${elt2}" "${elt3}")
-            endif()
-         elseif(${eltcnt} GREATER 2)
-            list(GET cmdelt 0 elt0)
-            list(GET cmdelt 1 elt1)
-            list(GET cmdelt 2 elt2)
-            if (${runml} EQUAL 0)
-               module("${elt0}" "${elt1}" "${elt2}")
-            else()
-               ml("${elt0}" "${elt1}" "${elt2}")
-            endif()
-         elseif(${eltcnt} GREATER 1)
-            list(GET cmdelt 0 elt0)
-            list(GET cmdelt 1 elt1)
-            if (${runml} EQUAL 0)
-               module("${elt0}" "${elt1}")
-            else()
-               ml("${elt0}" "${elt1}")
-            endif()
-         elseif(${eltcnt} GREATER 0)
-            list(GET cmdelt 0 elt0)
-            if (${runml} EQUAL 0)
-               module("${elt0}")
-            else()
-               ml("${elt0}")
-            endif()
-         else()
+         set(quotedArgs "")
+         # if command equals to NOARG string, means call with no arg passed
+         if(NOT "${cmd}" STREQUAL "NOARG")
+            string(REPLACE "," ";" cmdelt "${cmd}")
+            list (LENGTH cmdelt eltcnt)
             # empty arg list, means one empty arg
-            if (${runml} EQUAL 0)
-               module("")
+            if (${eltcnt} EQUAL 0)
+               string(APPEND quotedArgs "\"\"")
             else()
-               ml("")
+               foreach(elt IN LISTS cmdelt)
+                  if(NOT "${quotedArgs}" STREQUAL "")
+                     string(APPEND quotedArgs " ")
+                  endif()
+                  string(APPEND quotedArgs "[===[${elt}]===]")
+               endforeach()
             endif()
          endif()
+         cmake_language(EVAL CODE "${func}(${quotedArgs})")
       endif()
       if(NOT module_result AND NOT ${module_result} STREQUAL "")
          set(code 1)

testsuite/install.00-init/080-args.exp

@@ -103,7 +103,7 @@ foreach shell $othlang_list {
          set postmsg "\nError: \nExecution halted"
       }
       cmake {
-         set postmsg "\nCMake Error at testsuite/bin/install_test_cmake:115 \\\(message\\\):\n\n"
+         set postmsg "\nCMake Error at testsuite/bin/install_test_cmake:71 \\\(message\\\):\n\n"
       }
       default {
          set postmsg {}