testsuite: fix utilities install test on csh shells

cea-hpc · Oct 10, 2017 · d618459 · d618459
1 parent 95043aa
commit d618459
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/testsuite/install.00-init/030-options.exp b/testsuite/install.00-init/030-options.exp
@@ -70,8 +70,16 @@ if {$install_setbinpath eq "y"} {
       send_user "\tChecking other utilities availability\n"
    }
    foreach shell $shell_list {
-      testall_cmd "$shell" "command -v add.modules" "$install_bindir/add.modules" "" 0
-      testall_cmd "$shell" "command -v mkroot" "$install_bindir/mkroot" "" 0
+      switch -- $shell {
+         csh - tcsh {
+            testall_cmd "$shell" "which add.modules" "$install_bindir/add.modules" "" 0
+            testall_cmd "$shell" "which mkroot" "$install_bindir/mkroot" "" 0
+         }
+         default {
+            testall_cmd "$shell" "command -v add.modules" "$install_bindir/add.modules" "" 0
+            testall_cmd "$shell" "command -v mkroot" "$install_bindir/mkroot" "" 0
+         }
+      }
    }
 } elseif {$verbose > 0} {
    send_user "\tSkipping envml availability checks\n"