Merge branch 'master' into wip

Conflicts:
	src/bootimage.cpp
This commit is contained in:
Joshua Warner 2013-02-19 09:13:42 -07:00
commit 43de16a94d
3 changed files with 13 additions and 2 deletions

View File

@ -1,2 +1,2 @@
language: cpp language: cpp
script: "make test" script: ./test/ci.sh

View File

@ -15,6 +15,7 @@
#include "util.h" #include "util.h"
#include "stream.h" #include "stream.h"
#include "codegen/assembler.h" #include "codegen/assembler.h"
#include "codegen/promise.h"
#include "target.h" #include "target.h"
#include "binaryToObject/tools.h" #include "binaryToObject/tools.h"
#include "lzma.h" #include "lzma.h"
@ -29,6 +30,7 @@ extern "C" void __cxa_pure_virtual(void) { abort(); }
using namespace vm; using namespace vm;
using namespace avian::tools; using namespace avian::tools;
using namespace avian::util; using namespace avian::util;
using namespace avian::codegen;
namespace { namespace {
@ -330,7 +332,7 @@ makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code,
Client(Thread* t): t(t) { } Client(Thread* t): t(t) { }
virtual void NO_RETURN handleError() { virtual void NO_RETURN handleError() {
vm::abort(t); abort(t);
} }
private: private:

9
test/ci.sh Executable file
View File

@ -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