From e40af30fa5c8f73a0593b5342865d7380641ee48 Mon Sep 17 00:00:00 2001 From: Kazuki Sakamoto Date: Fri, 11 Nov 2016 09:04:31 -0800 Subject: [PATCH] Update .travis.yml for C# test Summary: Closes https://github.com/facebook/css-layout/pull/246 Reviewed By: emilsjolander Differential Revision: D4167133 Pulled By: splhack fbshipit-source-id: d55c0ff5155311f4da859b12b6485b120dac480b --- .travis.yml | 2 ++ csharp/tests/Facebook.CSSLayout/test_macos.sh | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09a753b4..8c126cdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,13 @@ before_install: - brew tap facebook/fb - brew install buck - brew outdated xctool || brew upgrade xctool + - brew install mono script: - buck test //:CSSLayout - buck test //java:java - buck test //CSSLayoutKit:CSSLayoutKit --config cxx.default_platform=iphonesimulator-x86_64 + - sh csharp/tests/Facebook.CSSLayout/test_macos.sh - buck run //benchmark:benchmark - git checkout HEAD^ - buck run //benchmark:benchmark diff --git a/csharp/tests/Facebook.CSSLayout/test_macos.sh b/csharp/tests/Facebook.CSSLayout/test_macos.sh index c37247b8..566170e4 100755 --- a/csharp/tests/Facebook.CSSLayout/test_macos.sh +++ b/csharp/tests/Facebook.CSSLayout/test_macos.sh @@ -9,11 +9,13 @@ if mcs --version >/dev/null 2>&1; then true; else exit 1 fi -if mono64 --version >/dev/null 2>&1; then true; else +if mono --version >/dev/null 2>&1; then true; else echo "ERROR: Can't execute mono64. You need to install Mono from http://www.mono-project.com/download/ and re-login to apply PATH environment." exit 1 fi +cd "$( dirname "$0" )" + NUNIT=NUnit-2.6.4/bin if [ -d $NUNIT \ -a -f $NUNIT/nunit-console.exe \ @@ -22,11 +24,10 @@ if [ -d $NUNIT \ -a -f $NUNIT/lib/nunit.core.interfaces.dll \ -a -f $NUNIT/lib/nunit.util.dll ]; then true; else curl -L -O https://github.com/nunit/nunitv2/releases/download/2.6.4/NUnit-2.6.4.zip - unzip NUnit-2.6.4.zip + unzip -qq NUnit-2.6.4.zip rm NUnit-2.6.4.zip fi -cd "$( dirname "$0" )" clang -g -Wall -Wextra -dynamiclib -o libCSSLayout.dylib -I../../.. ../../../CSSLayout/*.c ../../CSSLayout/CSSInterop.cpp mcs -debug -t:library -r:$NUNIT/nunit.framework.dll -out:CSSLayoutTest.dll *.cs ../../../csharp/Facebook.CSSLayout/*cs -MONO_PATH=$NUNIT mono64 --debug $NUNIT/nunit-console.exe CSSLayoutTest.dll +MONO_PATH=$NUNIT mono --arch=64 --debug $NUNIT/nunit-console.exe CSSLayoutTest.dll