From 51ec8befaa567430998c539d06a455e7a0dc136f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 27 Mar 2017 16:29:59 +0300 Subject: Add support for variables NEWCC and NEWCXX into all ci scripts. --- tools/ci/jobs/clang.sh | 8 ++++++++ tools/ci/jobs/clang3.sh | 8 ++++++++ tools/ci/jobs/clang33.sh | 8 ++++++++ tools/ci/jobs/clang34.sh | 8 ++++++++ tools/ci/jobs/clang35.sh | 8 ++++++++ tools/ci/jobs/clang36.sh | 8 ++++++++ tools/ci/jobs/clang37.sh | 8 ++++++++ tools/ci/jobs/clang38.sh | 8 ++++++++ tools/ci/jobs/clang39.sh | 8 ++++++++ tools/ci/jobs/clang39.sh_c++11.sh | 8 ++++++++ tools/ci/jobs/clang39_sdl2.sh | 8 ++++++++ tools/ci/jobs/clang40.sh | 8 ++++++++ tools/ci/jobs/cmake_gcc49.sh | 8 ++++++++ tools/ci/jobs/gcc44.sh | 8 ++++++++ tools/ci/jobs/gcc45.sh | 8 ++++++++ tools/ci/jobs/gcc46.sh | 8 ++++++++ tools/ci/jobs/gcc47.sh | 8 ++++++++ tools/ci/jobs/gcc47_c++11.sh | 8 ++++++++ tools/ci/jobs/gcc48.sh | 8 ++++++++ tools/ci/jobs/gcc48_c++11.sh | 8 ++++++++ tools/ci/jobs/gcc49.sh | 8 ++++++++ tools/ci/jobs/gcc49_c++11.sh | 8 ++++++++ tools/ci/jobs/gcc5_c++11.sh | 8 ++++++++ tools/ci/jobs/gcc5_h.sh | 8 ++++++++ tools/ci/jobs/gcc5_h_pugi.sh | 8 ++++++++ tools/ci/jobs/gcc5_sanitize.sh | 8 ++++++++ tools/ci/jobs/gcc5_sanitize_tests.sh | 8 ++++++++ tools/ci/jobs/gcc5_sdl2.sh | 8 ++++++++ tools/ci/jobs/gcc5_sdl2_c++11.sh | 8 ++++++++ tools/ci/jobs/gcc5_sdl2_tests.sh | 8 ++++++++ tools/ci/jobs/gcc5_tarball.sh | 8 ++++++++ tools/ci/jobs/gcc5_tests.sh | 8 ++++++++ tools/ci/jobs/gcc6.sh | 8 ++++++++ tools/ci/jobs/gcc6_lto.sh | 8 ++++++++ tools/ci/jobs/gcc6_sanitize.sh | 8 ++++++++ tools/ci/jobs/gcc6_sanitize_tests.sh | 8 ++++++++ tools/ci/jobs/gcc6_sdl2_tests.sh | 8 ++++++++ tools/ci/jobs/gcc6_sdl2_tests_gcov.sh | 8 ++++++++ tools/ci/jobs/gcc6_tarball_tests.sh | 8 ++++++++ tools/ci/jobs/gcc6_tests.sh | 8 ++++++++ tools/ci/jobs/gcc6_tests_gcov.sh | 8 ++++++++ tools/ci/jobs/gcc6_tests_simd.sh | 8 ++++++++ tools/ci/jobs/gccsnapshot.sh | 8 ++++++++ tools/ci/jobs/gccsnapshot_sanitize_tests.sh | 8 ++++++++ tools/ci/jobs/gccsnapshot_sdl2.sh | 8 ++++++++ tools/ci/jobs/gccsnapshot_tests.sh | 8 ++++++++ tools/ci/jobs/mplint.sh | 8 ++++++++ 47 files changed, 376 insertions(+) diff --git a/tools/ci/jobs/clang.sh b/tools/ci/jobs/clang.sh index c452826dd..d4cd1726a 100755 --- a/tools/ci/jobs/clang.sh +++ b/tools/ci/jobs/clang.sh @@ -2,6 +2,14 @@ export CC=clang export CXX=clang++ + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=$1.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang3.sh b/tools/ci/jobs/clang3.sh index 48a5e45a5..e06f5bd1f 100755 --- a/tools/ci/jobs/clang3.sh +++ b/tools/ci/jobs/clang3.sh @@ -2,6 +2,14 @@ export CC=clang export CXX=clang++ + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang3.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang33.sh b/tools/ci/jobs/clang33.sh index 54c4830c3..12c1107e4 100755 --- a/tools/ci/jobs/clang33.sh +++ b/tools/ci/jobs/clang33.sh @@ -2,6 +2,14 @@ export CC=clang-3.3 export CXX=clang++-3.3 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang33.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang34.sh b/tools/ci/jobs/clang34.sh index 840d17522..61f5e362f 100755 --- a/tools/ci/jobs/clang34.sh +++ b/tools/ci/jobs/clang34.sh @@ -2,6 +2,14 @@ export CC=clang-3.4 export CXX=clang++-3.4 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang34.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang35.sh b/tools/ci/jobs/clang35.sh index c64520196..382a7c728 100755 --- a/tools/ci/jobs/clang35.sh +++ b/tools/ci/jobs/clang35.sh @@ -2,6 +2,14 @@ export CC=clang-3.5 export CXX=clang++-3.5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang35.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang36.sh b/tools/ci/jobs/clang36.sh index e3d723837..1b6425dd7 100755 --- a/tools/ci/jobs/clang36.sh +++ b/tools/ci/jobs/clang36.sh @@ -2,6 +2,14 @@ export CC=clang-3.6 export CXX=clang++-3.6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang36.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang37.sh b/tools/ci/jobs/clang37.sh index f28fa827c..0f19711ee 100755 --- a/tools/ci/jobs/clang37.sh +++ b/tools/ci/jobs/clang37.sh @@ -2,6 +2,14 @@ export CC=clang-3.7 export CXX=clang++-3.7 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang37.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang38.sh b/tools/ci/jobs/clang38.sh index eb2890c3e..426b41f66 100755 --- a/tools/ci/jobs/clang38.sh +++ b/tools/ci/jobs/clang38.sh @@ -2,6 +2,14 @@ export CC=clang-3.8 export CXX=clang++-3.8 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang38.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang39.sh b/tools/ci/jobs/clang39.sh index 10c0f639e..ed273083a 100755 --- a/tools/ci/jobs/clang39.sh +++ b/tools/ci/jobs/clang39.sh @@ -2,6 +2,14 @@ export CC=clang-3.9 export CXX=clang++-3.9 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang39.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang39.sh_c++11.sh b/tools/ci/jobs/clang39.sh_c++11.sh index f1ed914fe..e703c8db5 100755 --- a/tools/ci/jobs/clang39.sh_c++11.sh +++ b/tools/ci/jobs/clang39.sh_c++11.sh @@ -2,6 +2,14 @@ export CC=clang-3.9 export CXX=clang++-3.9 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang39.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang39_sdl2.sh b/tools/ci/jobs/clang39_sdl2.sh index c893f7be1..a5e05a88a 100755 --- a/tools/ci/jobs/clang39_sdl2.sh +++ b/tools/ci/jobs/clang39_sdl2.sh @@ -2,6 +2,14 @@ export CC=clang-3.9 export CXX=clang++-3.9 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang39.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/clang40.sh b/tools/ci/jobs/clang40.sh index 679fefd30..bc6fc1bd5 100755 --- a/tools/ci/jobs/clang40.sh +++ b/tools/ci/jobs/clang40.sh @@ -2,6 +2,14 @@ export CC=clang-4.0 export CXX=clang++-4.0 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=clang40.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/cmake_gcc49.sh b/tools/ci/jobs/cmake_gcc49.sh index 5da7cc436..431a4c11f 100755 --- a/tools/ci/jobs/cmake_gcc49.sh +++ b/tools/ci/jobs/cmake_gcc49.sh @@ -2,6 +2,14 @@ export CC=gcc-4.9 export CXX=g++-4.9 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=cmake_gcc49.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc44.sh b/tools/ci/jobs/gcc44.sh index 4096c66bf..c831963d7 100755 --- a/tools/ci/jobs/gcc44.sh +++ b/tools/ci/jobs/gcc44.sh @@ -2,6 +2,14 @@ export CC=gcc-4.4 export CXX=g++-4.4 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc44.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc45.sh b/tools/ci/jobs/gcc45.sh index d23c07636..918116d62 100755 --- a/tools/ci/jobs/gcc45.sh +++ b/tools/ci/jobs/gcc45.sh @@ -2,6 +2,14 @@ export CC=gcc-4.5 export CXX=g++-4.5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc45.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc46.sh b/tools/ci/jobs/gcc46.sh index 595215d34..db845a606 100755 --- a/tools/ci/jobs/gcc46.sh +++ b/tools/ci/jobs/gcc46.sh @@ -2,6 +2,14 @@ export CC=gcc-4.6 export CXX=g++-4.6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc46.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc47.sh b/tools/ci/jobs/gcc47.sh index 9e62ac228..cfdb493d7 100755 --- a/tools/ci/jobs/gcc47.sh +++ b/tools/ci/jobs/gcc47.sh @@ -2,6 +2,14 @@ export CC=gcc-4.7 export CXX=g++-4.7 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc47.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc47_c++11.sh b/tools/ci/jobs/gcc47_c++11.sh index 147863fd9..92e102466 100755 --- a/tools/ci/jobs/gcc47_c++11.sh +++ b/tools/ci/jobs/gcc47_c++11.sh @@ -2,6 +2,14 @@ export CC=gcc-4.7 export CXX=g++-4.7 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc47.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc48.sh b/tools/ci/jobs/gcc48.sh index c85351ed4..018524b5a 100755 --- a/tools/ci/jobs/gcc48.sh +++ b/tools/ci/jobs/gcc48.sh @@ -2,6 +2,14 @@ export CC=gcc-4.8 export CXX=g++-4.8 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc47.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc48_c++11.sh b/tools/ci/jobs/gcc48_c++11.sh index be1b2ef9f..c1499e77f 100755 --- a/tools/ci/jobs/gcc48_c++11.sh +++ b/tools/ci/jobs/gcc48_c++11.sh @@ -2,6 +2,14 @@ export CC=gcc-4.8 export CXX=g++-4.8 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc48_c++11.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc49.sh b/tools/ci/jobs/gcc49.sh index f427569eb..893cecf8c 100755 --- a/tools/ci/jobs/gcc49.sh +++ b/tools/ci/jobs/gcc49.sh @@ -2,6 +2,14 @@ export CC=gcc-4.9 export CXX=g++-4.9 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc49.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc49_c++11.sh b/tools/ci/jobs/gcc49_c++11.sh index cc96cfba0..caa8b1899 100755 --- a/tools/ci/jobs/gcc49_c++11.sh +++ b/tools/ci/jobs/gcc49_c++11.sh @@ -2,6 +2,14 @@ export CC=gcc-4.9 export CXX=g++-4.9 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc49_c++11.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_c++11.sh b/tools/ci/jobs/gcc5_c++11.sh index f87e6ec81..d52a54006 100755 --- a/tools/ci/jobs/gcc5_c++11.sh +++ b/tools/ci/jobs/gcc5_c++11.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_h.sh b/tools/ci/jobs/gcc5_h.sh index 1d639561b..6a52f3fd4 100755 --- a/tools/ci/jobs/gcc5_h.sh +++ b/tools/ci/jobs/gcc5_h.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_h.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_h_pugi.sh b/tools/ci/jobs/gcc5_h_pugi.sh index 1d639561b..6a52f3fd4 100755 --- a/tools/ci/jobs/gcc5_h_pugi.sh +++ b/tools/ci/jobs/gcc5_h_pugi.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_h.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_sanitize.sh b/tools/ci/jobs/gcc5_sanitize.sh index cdfed2102..4d70578bb 100755 --- a/tools/ci/jobs/gcc5_sanitize.sh +++ b/tools/ci/jobs/gcc5_sanitize.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_sanitize.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_sanitize_tests.sh b/tools/ci/jobs/gcc5_sanitize_tests.sh index ea1c6b618..e247fd88b 100755 --- a/tools/ci/jobs/gcc5_sanitize_tests.sh +++ b/tools/ci/jobs/gcc5_sanitize_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_tests.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_sdl2.sh b/tools/ci/jobs/gcc5_sdl2.sh index da3ce2ac7..fd9f8a825 100755 --- a/tools/ci/jobs/gcc5_sdl2.sh +++ b/tools/ci/jobs/gcc5_sdl2.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_sdl2.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_sdl2_c++11.sh b/tools/ci/jobs/gcc5_sdl2_c++11.sh index b171f63ce..8e03eea08 100755 --- a/tools/ci/jobs/gcc5_sdl2_c++11.sh +++ b/tools/ci/jobs/gcc5_sdl2_c++11.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_sdl2.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_sdl2_tests.sh b/tools/ci/jobs/gcc5_sdl2_tests.sh index 8c38d4db0..5ec32437f 100755 --- a/tools/ci/jobs/gcc5_sdl2_tests.sh +++ b/tools/ci/jobs/gcc5_sdl2_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_sdl2_tests.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_tarball.sh b/tools/ci/jobs/gcc5_tarball.sh index ea11d59dd..def5ff368 100755 --- a/tools/ci/jobs/gcc5_tarball.sh +++ b/tools/ci/jobs/gcc5_tarball.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_tarball.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc5_tests.sh b/tools/ci/jobs/gcc5_tests.sh index c08b8087b..d53ad098c 100755 --- a/tools/ci/jobs/gcc5_tests.sh +++ b/tools/ci/jobs/gcc5_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-5 export CXX=g++-5 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc5_tests.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6.sh b/tools/ci/jobs/gcc6.sh index 53095c308..9a2724085 100755 --- a/tools/ci/jobs/gcc6.sh +++ b/tools/ci/jobs/gcc6.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_lto.sh b/tools/ci/jobs/gcc6_lto.sh index e8fd09511..5488715f3 100755 --- a/tools/ci/jobs/gcc6_lto.sh +++ b/tools/ci/jobs/gcc6_lto.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_sanitize.sh b/tools/ci/jobs/gcc6_sanitize.sh index 7e871529b..c1217745f 100755 --- a/tools/ci/jobs/gcc6_sanitize.sh +++ b/tools/ci/jobs/gcc6_sanitize.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_sanitize_tests.sh b/tools/ci/jobs/gcc6_sanitize_tests.sh index 78da425c4..789526833 100755 --- a/tools/ci/jobs/gcc6_sanitize_tests.sh +++ b/tools/ci/jobs/gcc6_sanitize_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_sdl2_tests.sh b/tools/ci/jobs/gcc6_sdl2_tests.sh index 0fb1bea7e..0274e77ac 100755 --- a/tools/ci/jobs/gcc6_sdl2_tests.sh +++ b/tools/ci/jobs/gcc6_sdl2_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh index 1a4d7c093..e121dc73a 100755 --- a/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh +++ b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_tarball_tests.sh b/tools/ci/jobs/gcc6_tarball_tests.sh index 29221a23d..149edee92 100755 --- a/tools/ci/jobs/gcc6_tarball_tests.sh +++ b/tools/ci/jobs/gcc6_tarball_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6_tarballtests.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh index c071143e8..48dd282c3 100755 --- a/tools/ci/jobs/gcc6_tests.sh +++ b/tools/ci/jobs/gcc6_tests.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_tests_gcov.sh b/tools/ci/jobs/gcc6_tests_gcov.sh index 61278ca71..50e83fb99 100755 --- a/tools/ci/jobs/gcc6_tests_gcov.sh +++ b/tools/ci/jobs/gcc6_tests_gcov.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gcc6_tests_simd.sh b/tools/ci/jobs/gcc6_tests_simd.sh index 21df222c4..77b639e61 100755 --- a/tools/ci/jobs/gcc6_tests_simd.sh +++ b/tools/ci/jobs/gcc6_tests_simd.sh @@ -2,6 +2,14 @@ export CC=gcc-6 export CXX=g++-6 + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc6.log source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh index 207f963b2..26eb5e88e 100755 --- a/tools/ci/jobs/gccsnapshot.sh +++ b/tools/ci/jobs/gccsnapshot.sh @@ -3,6 +3,14 @@ export CC=gcc export CXX=g++ export LOGFILE=gcc-snapshot.log + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export PATH=/usr/lib/gcc-snapshot/bin:$PATH source ./tools/ci/scripts/init.sh diff --git a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh index 7bc757464..a3ac1a365 100755 --- a/tools/ci/jobs/gccsnapshot_sanitize_tests.sh +++ b/tools/ci/jobs/gccsnapshot_sanitize_tests.sh @@ -2,6 +2,14 @@ export CC=gcc export CXX=g++ + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc-snapshot.log export PATH=/usr/lib/gcc-snapshot/bin:$PATH diff --git a/tools/ci/jobs/gccsnapshot_sdl2.sh b/tools/ci/jobs/gccsnapshot_sdl2.sh index 7a46b6b81..f6c53998e 100755 --- a/tools/ci/jobs/gccsnapshot_sdl2.sh +++ b/tools/ci/jobs/gccsnapshot_sdl2.sh @@ -2,6 +2,14 @@ export CC=gcc export CXX=g++ + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc-snapshot.log export PATH=/usr/lib/gcc-snapshot/bin:$PATH diff --git a/tools/ci/jobs/gccsnapshot_tests.sh b/tools/ci/jobs/gccsnapshot_tests.sh index 1d603e08a..cfce93c32 100755 --- a/tools/ci/jobs/gccsnapshot_tests.sh +++ b/tools/ci/jobs/gccsnapshot_tests.sh @@ -2,6 +2,14 @@ export CC=gcc export CXX=g++ + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=gcc-snapshot.log export PATH=/usr/lib/gcc-snapshot/bin:$PATH diff --git a/tools/ci/jobs/mplint.sh b/tools/ci/jobs/mplint.sh index c247de0ca..31cda0b44 100755 --- a/tools/ci/jobs/mplint.sh +++ b/tools/ci/jobs/mplint.sh @@ -2,6 +2,14 @@ export CC=gcc export CXX=g++ + +if [ "$NEWCC" != "" ]; then + export CC="$NEWCC" +fi +if [ "$NEWCXX" != "" ]; then + export CXX="$NEWCXX" +fi + export LOGFILE=mplint_po.log source ./tools/ci/scripts/init.sh -- cgit v1.2.3-60-g2f50