From d179ff80d4b7cf257097ab95c4b1bb95a216a5ca Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 29 Apr 2022 11:06:20 +0200 Subject: [PATCH] Fix tests --- README.md | 4 ++-- test/test.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 33c7c60c4b..337224a298 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,8 @@ available tools, run `emsdk list`. * If a tool/SDK is currently active, a star * will be shown next to it. * If a tool/SDK is currently active, but the terminal your are calling emsdk from does not have `PATH` and environment set up to utilize that tool, a star - in parentheses (\*) will be shown next to it. Run `emsdk_env.bat` (Windows) or - `source ./emsdk_env.sh` (Linux and OS X) to set up the environment for the + in parentheses (\*) will be shown next to it. Run `emsdkpy/emsdk_env.bat` (Windows) or + `source emsdkpy/emsdk_env.sh` (Linux and OS X) to set up the environment for the calling terminal. ### How do I install a tool/SDK version? diff --git a/test/test.sh b/test/test.sh index 9d8171e79b..c6e8142c8a 100755 --- a/test/test.sh +++ b/test/test.sh @@ -9,7 +9,7 @@ set -e # activated. ./emsdk install sdk-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2 ./emsdk activate sdk-upstream-5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2 -source ./emsdk_env.sh +source emsdkpy/emsdk_env.sh which emcc emcc -v @@ -17,7 +17,7 @@ emcc -v # set in the environment, so that we can test it is later removed ./emsdk install sdk-fastcomp-3b8cff670e9233a6623563add831647e8689a86b ./emsdk activate sdk-fastcomp-3b8cff670e9233a6623563add831647e8689a86b -source ./emsdk_env.sh +source emsdkpy/emsdk_env.sh which emcc emcc -v test -n "$EM_CACHE" @@ -26,7 +26,7 @@ test -n "$EM_CACHE" # of test.py. ./emsdk install latest ./emsdk activate latest -source ./emsdk_env.sh --build=Release +source emsdkpy/emsdk_env.sh --build=Release # Test that EM_CACHE was unset test -z "$EM_CACHE"