From: khizmax <libcds.dev@gmail.com>
Date: Wed, 3 May 2017 18:26:13 +0000 (+0300)
Subject: Added GCC-7 to CI
X-Git-Tag: v2.3.0~50
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;ds=inline;h=e3191e7d581df71fb8712bbf5edce75bfeead9c8;p=libcds.git

Added GCC-7 to CI
---

diff --git a/build/CI/VASEx-CI-2/cds-libs b/build/CI/VASEx-CI-2/cds-libs
index 6b27eb7b..acc24ad8 100644
--- a/build/CI/VASEx-CI-2/cds-libs
+++ b/build/CI/VASEx-CI-2/cds-libs
@@ -59,6 +59,21 @@ gcc-6-64-tsan-boost-lib:   stage64-gcc6-tsan/lib
 gcc-6-gtest:          $GTEST_ROOT
 gcc-6-64-gtest-lib:   $GTEST_ROOT/lib-gcc6/libgtest.a
 
+########################################
+#GCC-7
+gcc-7-root:           $GCC7_ROOT/bin
+gcc-7-cxx:            g++-7
+gcc-7-cc:             gcc-7
+gcc-7-boost:          $BOOST_ROOT
+gcc-7-cxxflags:       -march=native
+gcc-7-exe-ldflags:    -Wl,-rpath=$GCC7_ROOT/lib64
+gcc-7-extlib:         rt
+gcc-7-64-boost-lib:   stage64-gcc7/lib
+gcc-7-64-asan-boost-lib:   stage64-gcc7-asan/lib
+gcc-7-64-tsan-boost-lib:   stage64-gcc7-tsan/lib
+gcc-7-gtest:          $GTEST_ROOT
+gcc-7-64-gtest-lib:   $GTEST_ROOT/lib-gcc7/libgtest.a
+
 ########################################
 # clang-3.6
 clang-3.6-root:           $CLANG36_ROOT/bin
diff --git a/build/CI/VASEx-CI-2/ci-build b/build/CI/VASEx-CI-2/ci-build
index ec8394e9..6ba9b7b4 100755
--- a/build/CI/VASEx-CI-2/ci-build
+++ b/build/CI/VASEx-CI-2/ci-build
@@ -29,6 +29,11 @@ case "$TOOLSET" in
 	$CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-6-64
 	EXIT_CODE=$?
 	;;
+    "x64-gcc-7")
+	echo "GCC-7 '$BUILD_TYPE', toolset root: $GCC7_ROOT"
+	$CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-7-64
+	EXIT_CODE=$?
+	;;
     "x64-clang-3.6")
 	echo "clang-3.6 '$BUILD_TYPE', toolset root: $CLANG36_ROOT"
 	$CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.6-64
diff --git a/build/CI/VASEx-CI-2/ci-env b/build/CI/VASEx-CI-2/ci-env
index 23b1c843..32a50b4b 100644
--- a/build/CI/VASEx-CI-2/ci-env
+++ b/build/CI/VASEx-CI-2/ci-env
@@ -10,6 +10,7 @@ GCC48_ROOT=$TOOLSET_ROOT/gcc-4.8
 GCC49_ROOT=$TOOLSET_ROOT/gcc-4.9
 GCC5_ROOT=$TOOLSET_ROOT/gcc-5
 GCC6_ROOT=$TOOLSET_ROOT/gcc-6
+GCC7_ROOT=$TOOLSET_ROOT/gcc-7
 
 CLANG36_ROOT=$TOOLSET_ROOT/clang-3.6
 CLANG37_ROOT=$TOOLSET_ROOT/clang-3.7
diff --git a/build/CI/VASEx-CI/cds-libs b/build/CI/VASEx-CI/cds-libs
index b4417f8a..6a4c646e 100644
--- a/build/CI/VASEx-CI/cds-libs
+++ b/build/CI/VASEx-CI/cds-libs
@@ -55,6 +55,22 @@ gcc-6-64-tsan-boost-lib:   stage64-gcc6-tsan/lib
 gcc-6-gtest:          $GTEST_ROOT
 gcc-6-64-gtest-lib:   $GTEST_ROOT/lib-gcc6/libgtest.a
 
+
+########################################
+#GCC-7
+gcc-7-root:           $GCC6_ROOT/bin
+gcc-7-cxx:            g++-7
+gcc-7-cc:             gcc-7
+gcc-7-boost:          $BOOST_ROOT
+gcc-7-cxxflags:       -march=native
+gcc-7-exe-ldflags:    -Wl,-rpath=$GCC7_ROOT/lib64
+gcc-7-64-boost-lib:   stage64-gcc7/lib
+gcc-7-64-asan-boost-lib:   stage64-gcc7-asan/lib
+gcc-7-64-tsan-boost-lib:   stage64-gcc7-tsan/lib
+gcc-7-gtest:          $GTEST_ROOT
+gcc-7-64-gtest-lib:   $GTEST_ROOT/lib-gcc7/libgtest.a
+
+
 ########################################
 # clang-3.6
 clang-3.6-root:           $CLANG36_ROOT/bin
diff --git a/build/CI/VASEx-CI/ci-build b/build/CI/VASEx-CI/ci-build
index 32f00a18..95656abf 100755
--- a/build/CI/VASEx-CI/ci-build
+++ b/build/CI/VASEx-CI/ci-build
@@ -29,6 +29,11 @@ case "$TOOLSET" in
 	$CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-6-64
 	exit $?
 	;;
+    "x64-gcc-7")
+	echo "GCC-7 '$BUILD_TYPE', toolset root: $GCC7_ROOT"
+	$CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-gcc-7-64
+	exit $?
+	;;
     "x64-clang-3.6")
 	echo "clang-3.6 '$BUILD_TYPE', toolset root: $CLANG36_ROOT"
 	$CI_SCRIPT_PATH/ci-script/cds-$BUILD_TYPE-clang-3.6-64
diff --git a/build/CI/VASEx-CI/ci-env b/build/CI/VASEx-CI/ci-env
index ac08807b..3c6fe156 100644
--- a/build/CI/VASEx-CI/ci-env
+++ b/build/CI/VASEx-CI/ci-env
@@ -10,6 +10,7 @@ GCC48_ROOT=$TOOLSET_ROOT/gcc-4.8
 GCC49_ROOT=$TOOLSET_ROOT/gcc-4.9
 GCC5_ROOT=$TOOLSET_ROOT/gcc-5
 GCC6_ROOT=$TOOLSET_ROOT/gcc-6
+GCC7_ROOT=$TOOLSET_ROOT/gcc-7
 
 CLANG35_ROOT=$TOOLSET_ROOT/clang-3.5
 CLANG36_ROOT=$TOOLSET_ROOT/clang-3.6