summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml17
-rw-r--r--Makefile.in2
2 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 043b598..9e700cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ install:
sudo add-apt-repository --yes $PPA;
fi
- sudo apt-get update -qq
- - sudo apt-get install -qq $PACKAGE
+ - sudo apt-get install -qq $PACKAGE $DEBUGPACKAGE
- sudo apt-get install -qq libgtest-dev valgrind
- make --version
@@ -42,6 +42,7 @@ before_script:
wget http://clang.llvm.org/libstdc++4.6-clang11.patch;
sudo patch /usr/include/c++/4.6/type_traits < libstdc++4.6-clang11.patch;
fi
+ - sudo sed -i /usr/lib/debug/usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.*-gdb.py -e "s:^libdir = .*$:libdir = '/usr/lib/x86_64-linux-gnu':"
## Main test script
script:
@@ -76,23 +77,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 libstdc++6-4.6-dbg"
+ env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.2 DEBUGPACKAGE=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 libstdc++6-4.6-dbg"
+ env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.2 DEBUGPACKAGE=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 libstdc++6-4.6-dbg
+ env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.3 DEBUGPACKAGE=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 libstdc++6-4.6-dbg
+ env: REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PPA=ppa:h-rayflood/llvm PACKAGE=clang-3.4 DEBUGPACKAGE=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 libstdc++6-4.7-dbg"
+ env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.7 DEBUGPACKAGE=libstdc++6-4.8-dbg
- compiler: gcc
- 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"
+ env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.8 DEBUGPACKAGE=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 libstdc++6-4.7-dbg" 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 DEBUGPACKAGE=libstdc++6-4.8-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 f39261f..3cf1817 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -440,7 +440,7 @@ obj/gtest-all.pdc.o: ${GTEST_DIR}/src/gtest-all.cc
$(MKDIR_FIRST)
$c ${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $<
-obj/debug-debug/test.o: override CXXFLAGS += -g -O0
+obj/debug-debug/test.pdc.o: override CXXFLAGS += -g -O0 -gdwarf-3
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'