DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fixes Travis error reporting

Browse Source 
Summary:
Just cherry-picked my commit from #508
Closes https://github.com/facebook/yoga/pull/542

Differential Revision: D5002335

Pulled By: emilsjolander

fbshipit-source-id: 3f61a235c41627e9cfb90dce150323f11892e65f
This commit is contained in:
Maël Nison
2017-05-04 07:16:40 -07:00
committed by Facebook Github Bot
parent 91230ae177
commit c7ab004922
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -53,8 +53,8 @@ before_install:
if [[ $TARGET = "js" ]]; then if [[ $TARGET = "js" ]]; then
wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz && 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/ && tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
/tmp/emsdk_portable/emsdk install latest >& /dev/null && /tmp/emsdk-portable/emsdk install latest 2>&1 | grep -v '^x ' &&
/tmp/emsdk_portable/emsdk activate latest /tmp/emsdk-portable/emsdk activate latest
fi fi
# Android # Android
@@ -77,7 +77,7 @@ before_install:
cd javascript && cd javascript &&
npm install && npm install &&
unset CC && unset CXX && unset LINK && unset CC && unset CXX && unset LINK &&
source /tmp/emsdk_portable/emsdk_env.sh && source /tmp/emsdk-portable/emsdk_env.sh &&
npm run build:browser npm run build:browser
) fi ) fi

2
yoga/Yoga.c
View File

@@ -415,7 +415,7 @@ YGConfigRef YGConfigGetDefault() {
YGConfigRef YGConfigNew(void) { YGConfigRef YGConfigNew(void) {
const YGConfigRef config = gYGMalloc(sizeof(YGConfig)); 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++; gConfigInstanceCount++;
memcpy(config, &gYGConfigDefaults, sizeof(YGConfig)); memcpy(config, &gYGConfigDefaults, sizeof(YGConfig));