Skip to content
This repository was archived by the owner on Dec 18, 2017. It is now read-only.

Commit 7cbdb9b

Browse files
committed
✅ fix some of the path retrival code
1 parent eb95fd4 commit 7cbdb9b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

test/sh/tests/use/Use-ing a version puts the matching runtime on the PATH.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ $_KVM_COMMAND_NAME use "$_TEST_VERSION"
1010
# Check paths
1111
EXPECTED_ROOT="$KVM_USER_HOME/runtimes/$_KVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
1212

13-
[ $(path_of $_KVM_RUNTIME_EXEC_NAME) == "$EXPECTED_ROOT/$_KVM_RUNTIME_EXEC_NAME" ] || die "'$_KVM_RUNTIME_EXEC_NAME' was not available at the specified path!"
14-
[ $(path_of $_KVM_RUNTIME_HOST_NAME) == "$EXPECTED_ROOT/$_KVM_RUNTIME_HOST_NAME" ] || die "'$_KVM_RUNTIME_HOST_NAME' was not available at the specified path!"
15-
[ $(path_of $_KVM_PACKAGE_MANAGER_NAME) == "$EXPECTED_ROOT/$_KVM_PACKAGE_MANAGER_NAME" ] || die "'$_KVM_PACKAGE_MANAGER_NAME' was not available at the specified path!"
13+
[ "$(path_of $_KVM_RUNTIME_EXEC_NAME)" == "$EXPECTED_ROOT/$_KVM_RUNTIME_EXEC_NAME" ] || die "'$_KVM_RUNTIME_EXEC_NAME' was not available at the specified path!"
14+
[ "$(path_of $_KVM_RUNTIME_HOST_NAME)" == "$EXPECTED_ROOT/$_KVM_RUNTIME_HOST_NAME" ] || die "'$_KVM_RUNTIME_HOST_NAME' was not available at the specified path!"
15+
[ "$(path_of $_KVM_PACKAGE_MANAGER_NAME)" == "$EXPECTED_ROOT/$_KVM_PACKAGE_MANAGER_NAME" ] || die "'$_KVM_PACKAGE_MANAGER_NAME' was not available at the specified path!"

test/sh/tests/use/Use-ing an alias puts the matching runtime on the path.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ $_KVM_COMMAND_NAME use default
1010
# Check paths
1111
EXPECTED_ROOT="$KVM_USER_HOME/runtimes/$_KVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
1212

13-
[ $(path_of $_KVM_RUNTIME_EXEC_NAME) == "$EXPECTED_ROOT/$_KVM_RUNTIME_EXEC_NAME" ] || die "'$_KVM_RUNTIME_EXEC_NAME' was not available at the specified path!"
14-
[ $(path_of $_KVM_RUNTIME_HOST_NAME) == "$EXPECTED_ROOT/$_KVM_RUNTIME_HOST_NAME" ] || die "'$_KVM_RUNTIME_HOST_NAME' was not available at the specified path!"
15-
[ $(path_of $_KVM_PACKAGE_MANAGER_NAME) == "$EXPECTED_ROOT/$_KVM_PACKAGE_MANAGER_NAME" ] || die "'$_KVM_PACKAGE_MANAGER_NAME' was not available at the specified path!"
13+
[ "$(path_of $_KVM_RUNTIME_EXEC_NAME)" == "$EXPECTED_ROOT/$_KVM_RUNTIME_EXEC_NAME" ] || die "'$_KVM_RUNTIME_EXEC_NAME' was not available at the specified path!"
14+
[ "$(path_of $_KVM_RUNTIME_HOST_NAME)" == "$EXPECTED_ROOT/$_KVM_RUNTIME_HOST_NAME" ] || die "'$_KVM_RUNTIME_HOST_NAME' was not available at the specified path!"
15+
[ "$(path_of $_KVM_PACKAGE_MANAGER_NAME)" == "$EXPECTED_ROOT/$_KVM_PACKAGE_MANAGER_NAME" ] || die "'$_KVM_PACKAGE_MANAGER_NAME' was not available at the specified path!"

test/sh/tests/use/Use-ing none clears runtime from the PATH.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ $_KVM_COMMAND_NAME use none
1010
# Check paths
1111
EXPECTED_ROOT="$KVM_USER_HOME/runtimes/$_KVM_RUNTIME_PACKAGE_NAME-mono.$_TEST_VERSION/bin"
1212

13-
[ $(path_of $_KVM_RUNTIME_EXEC_NAME) != "$EXPECTED_ROOT/$_KVM_RUNTIME_EXEC_NAME" ] || die "'$_KVM_RUNTIME_EXEC_NAME' was still available at the expected path!"
14-
[ $(path_of $_KVM_RUNTIME_HOST_NAME) != "$EXPECTED_ROOT/$_KVM_RUNTIME_HOST_NAME" ] || die "'$_KVM_RUNTIME_HOST_NAME' was still available at the expected path!"
15-
[ $(path_of $_KVM_PACKAGE_MANAGER_NAME) != "$EXPECTED_ROOT/$_KVM_PACKAGE_MANAGER_NAME" ] || die "'$_KVM_PACKAGE_MANAGER_NAME' was still available at the expected path!"
13+
[ "$(path_of $_KVM_RUNTIME_EXEC_NAME)" != "$EXPECTED_ROOT/$_KVM_RUNTIME_EXEC_NAME" ] || die "'$_KVM_RUNTIME_EXEC_NAME' was still available at the expected path!"
14+
[ "$(path_of $_KVM_RUNTIME_HOST_NAME)" != "$EXPECTED_ROOT/$_KVM_RUNTIME_HOST_NAME" ] || die "'$_KVM_RUNTIME_HOST_NAME' was still available at the expected path!"
15+
[ "$(path_of $_KVM_PACKAGE_MANAGER_NAME)" != "$EXPECTED_ROOT/$_KVM_PACKAGE_MANAGER_NAME" ] || die "'$_KVM_PACKAGE_MANAGER_NAME' was still available at the expected path!"

0 commit comments

Comments
 (0)