Merge branch 'master' into merge-2.064

Conflicts:
	runtime/phobos
This commit is contained in:
Kai Nacke
2013-12-05 13:15:41 +01:00
2 changed files with 5 additions and 3 deletions

View File

@@ -24,10 +24,12 @@ env:
- LLVM_PACKAGE="llvm-3.3 llvm-3.3-dev" TESTSUITE_FILTER=release OPTS="-DMULTILIB=ON"
- LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=debug
- LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=release
- LLVM_PACKAGE="llvm-3.5 llvm-3.5-dev" TESTSUITE_FILTER=debug
- LLVM_PACKAGE="llvm-3.5 llvm-3.5-dev" TESTSUITE_FILTER=release
matrix:
allow_failures:
- env: LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=debug
- env: LLVM_PACKAGE="llvm-3.4 llvm-3.4-dev" TESTSUITE_FILTER=release
- env: LLVM_PACKAGE="llvm-3.5 llvm-3.5-dev" TESTSUITE_FILTER=debug
- env: LLVM_PACKAGE="llvm-3.5 llvm-3.5-dev" TESTSUITE_FILTER=release
script:
- cmake $OPTS .
- make