admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix environment variables to be consistently set when using --system or --permanent (#515)

Browse Source 
Also switch PostMessage to SendMessageWithTimeout and only send one if
environment variables actually changed.

Also, enable and fix --permanent unit tests.
This commit is contained in:
Chris Savoie
2020-10-09 12:58:59 -07:00
committed by GitHub
parent 107dc62dd7
commit 4fe6e492c0
3 changed files with 113 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/test_permanent.ps1
View File

@@ -33,24 +33,24 @@ if (!$EM_CACHE_USER) {
$path_split = $PATH_USER.Split(';')
$EMSDK_Path_USER = $path_split | Where-Object { $_ -match 'emsdk' }
$EMSDK_Path_USER = $path_split | Where-Object { $_ -like "$repo_root*" }
if (!$EMSDK_Path_USER) {
throw "No path is added!"
}
$EMSDK_NODE_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\node' }
$EMSDK_NODE_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\node*" }
if (!$EMSDK_NODE_Path_USER) {
throw "emsdk\node is not added to path."
throw "$repo_root\\node is not added to path."
}
$EMSDK_PYTHON_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\python' }
$EMSDK_PYTHON_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\python*" }
if (!$EMSDK_PYTHON_Path_USER) {
throw "emsdk\python is not added to path."
throw "$repo_root\\python is not added to path."
}
$EMSDK_JAVA_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\java' }
$EMSDK_JAVA_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\java*" }
if (!$EMSDK_JAVA_Path_USER) {
throw "emsdk\java is not added to path."
throw "$repo_root\\java is not added to path."
}
$EMSDK_UPSTREAM_Path_USER = $path_split | Where-Object { $_ -match 'emsdk\\upstream\\emscripten' }
$EMSDK_UPSTREAM_Path_USER = $path_split | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
if (!$EMSDK_UPSTREAM_Path_USER) {
throw "emsdk\upstream\emscripten is not added to path."
throw "$repo_root\\upstream\emscripten is not added to path."
}