diff --git a/.travis.yml b/.travis.yml index 33df95b3..a90a537f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,8 +53,8 @@ before_install: if [[ $TARGET = "js" ]]; then wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz && tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ && - /tmp/emsdk_portable/emsdk install latest >& /dev/null && - /tmp/emsdk_portable/emsdk activate latest + /tmp/emsdk-portable/emsdk install latest 2>&1 | grep -v '^x ' && + /tmp/emsdk-portable/emsdk activate latest fi # Android @@ -77,7 +77,7 @@ before_install: cd javascript && npm install && unset CC && unset CXX && unset LINK && - source /tmp/emsdk_portable/emsdk_env.sh && + source /tmp/emsdk-portable/emsdk_env.sh && npm run build:browser ) fi diff --git a/yoga/Yoga.c b/yoga/Yoga.c index 63a56b7a..44245b10 100644 --- a/yoga/Yoga.c +++ b/yoga/Yoga.c @@ -415,7 +415,7 @@ YGConfigRef YGConfigGetDefault() { YGConfigRef YGConfigNew(void) { const YGConfigRef config = gYGMalloc(sizeof(YGConfig)); - YGLog(NULL, config != NULL, "Could not allocate memory for config"); + YGAssert(config != NULL, "Could not allocate memory for config"); gConfigInstanceCount++; memcpy(config, &gYGConfigDefaults, sizeof(YGConfig));