From fbbd718fe1870a6acee7b9a07d84e21022d47017 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Sat, 16 Feb 2013 08:36:29 -0700 Subject: [PATCH 1/2] fix bootimage build --- src/bootimage.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootimage.cpp b/src/bootimage.cpp index c2879403a2..0dba4af877 100644 --- a/src/bootimage.cpp +++ b/src/bootimage.cpp @@ -15,6 +15,7 @@ #include "util.h" #include "stream.h" #include "codegen/assembler.h" +#include "codegen/promise.h" #include "target.h" #include "binaryToObject/tools.h" #include "lzma.h" @@ -25,6 +26,7 @@ extern "C" void __cxa_pure_virtual(void) { abort(); } using namespace vm; using namespace avian::tools; +using namespace avian::codegen; namespace { @@ -326,7 +328,7 @@ makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code, Client(Thread* t): t(t) { } virtual void NO_RETURN handleError() { - vm::abort(t); + abort(t); } private: From fd0b2b844bf3d31cfe45b3d9112e2f555a7057d9 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Sat, 16 Feb 2013 08:36:41 -0700 Subject: [PATCH 2/2] test various configurations besides the default in Travis CI --- .travis.yml | 2 +- test/ci.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 test/ci.sh diff --git a/.travis.yml b/.travis.yml index e2d152d5f2..18dcccd6af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: cpp -script: "make test" +script: ./test/ci.sh diff --git a/test/ci.sh b/test/ci.sh new file mode 100755 index 0000000000..555ce4687e --- /dev/null +++ b/test/ci.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +make mode=debug test +make test +make process=interpret test +make bootimage=true test +make tails=true continuations=true test