test: Shell tests should use unified timeout command

test/shell/env0.sh

@@ -1,10 +1,10 @@
 #!/bin/bash -e
 
+. "$(dirname "$0")/../util.sh"
+
 set -o errexit
 set -o pipefail
 
-. ../util.sh
-
 # these values represent environment variable values below or defaults set in test/shell/env0.mcl
 regex="123,,:123,321,:true,false:123"
 
@@ -14,7 +14,7 @@ if [[ ! "$tmpdir" =~ "/tmp" ]]; then
 	exit 99
 fi
 
-env TMPDIR="${tmpdir}" TEST=123 EMPTY="" $timeout --kill-after=360s 300s "$MGMT" run --tmp-prefix --converged-timeout=5 lang --lang env0.mcl
+env TMPDIR="${tmpdir}" TEST=123 EMPTY="" $TIMEOUT "$MGMT" run --tmp-prefix --converged-timeout=5 lang --lang env0.mcl
 e=$?
 
 egrep "$regex" "$tmpdir/environ" || fail_test "Could not match '$(cat "$tmpdir/environ")' in '$tmpdir/environ' to '$regex'."