diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-28 18:32:32 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-28 18:32:32 -0700 |
| commit | 6763680b3737ccc2b401396d0a963ef20f732b10 (patch) | |
| tree | 7409cb4a7f0af9d6e5d951eb1ca3c3216c6cd073 | |
| parent | f9e700192ddaf25974a57050298cfe879b5b70eb (diff) | |
| download | tmwa-6763680b3737ccc2b401396d0a963ef20f732b10.tar.gz tmwa-6763680b3737ccc2b401396d0a963ef20f732b10.tar.bz2 tmwa-6763680b3737ccc2b401396d0a963ef20f732b10.tar.xz tmwa-6763680b3737ccc2b401396d0a963ef20f732b10.zip | |
Stuff that's necessary for travis to debug debug
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | Makefile.in | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index fd6d110..043b598 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,23 +76,23 @@ env: matrix: allow_failures: - compiler: clang - env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.2 + env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE="clang-3.2 libstdc++6-4.6-dbg" exclude: - env: ignore=this include: - compiler: clang - env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.2 + env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE="clang-3.2 libstdc++6-4.6-dbg" - compiler: clang - env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.3 + env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE="clang-3.3 libstdc++6-4.6-dbg - compiler: clang - env: REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.4 + env: REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PPA=ppa:h-rayflood/llvm PACKAGE="clang-3.4 libstdc++6-4.6-dbg - compiler: gcc - env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 + env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE="g++-4.7 libstdc++6-4.7-dbg" - compiler: gcc - env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.8 + env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PPA=ppa:ubuntu-toolchain-r/test PACKAGE="g++-4.8 libstdc++6-4.8-dbg" - compiler: gcc - env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 EXTRA_CONFIGURE_ARGS=--disable-warnings + env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE="g++-4.7 libstdc++6-4.7-dbg" EXTRA_CONFIGURE_ARGS=--disable-warnings # everything that was pushed to stable was already on 'master', except # the version change and some doc changes. diff --git a/Makefile.in b/Makefile.in index 995b7e9..f39261f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -443,6 +443,11 @@ obj/gtest-all.pdc.o: ${GTEST_DIR}/src/gtest-all.cc obj/debug-debug/test.o: override CXXFLAGS += -g -O0 obj/run-test-debug-debug.stamp: override TESTER=gdb -return-child-result -nx -batch -x ${SRC_DIR}/tools/debug-debug.gdb --args false obj/run-test-debug-debug.stamp: tools/debug-debug.gdb +ifeq '$(findstring clang,${CXX})' 'clang' +obj/run-test-debug-debug.stamp: + @echo "Error: sorry, but clang can't be used with gdb" + -false +endif test: $(patsubst bin/%,obj/run-%.stamp,${TEST_BINARIES}) obj/run-%.stamp: bin/% |