From d7bad38b5da1e81dbe4834d1cbd7848fe5581516 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 14 May 2018 22:59:34 -0500
Subject: [PATCH] Make the lib test generic to main or PRs.

---
 tools/ci/common.py       | 33 +++++++++++++++++++++++++++++++++
 tools/ci/library_test.py | 11 +++--------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/tools/ci/common.py b/tools/ci/common.py
index bb7a189..50ca860 100644
--- a/tools/ci/common.py
+++ b/tools/ci/common.py
@@ -71,6 +71,22 @@ toolset_info = {
         'toolset' : 'clang',
         'version' : ''
         },
+    'clang-5.0' : {
+        'deb' : ["http://apt.llvm.org/trusty/","llvm-toolchain-trusty-5.0","main"],
+        'apt-key' : ['http://apt.llvm.org/llvm-snapshot.gpg.key'],
+        'package' : 'clang-5.0',
+        'command' : 'clang++-5.0',
+        'toolset' : 'clang',
+        'version' : ''
+        },
+    'clang-6.0' : {
+        'deb' : ["http://apt.llvm.org/trusty/","llvm-toolchain-trusty-6.0","main"],
+        'apt-key' : ['http://apt.llvm.org/llvm-snapshot.gpg.key'],
+        'package' : 'clang-6.0',
+        'command' : 'clang++-6.0',
+        'toolset' : 'clang',
+        'version' : ''
+        },
     'gcc-4.7' : {
         'ppa' : ["ppa:ubuntu-toolchain-r/test"],
         'package' : 'g++-4.7',
@@ -121,6 +137,13 @@ toolset_info = {
         'toolset' : 'gcc',
         'version' : ''
         },
+    'gcc-8' : {
+        'ppa' : ["ppa:ubuntu-toolchain-r/test"],
+        'package' : 'g++-8',
+        'command' : 'g++-8',
+        'toolset' : 'gcc',
+        'version' : ''
+        },
     'mingw-5' : {
         'toolset' : 'gcc',
         'command' : 'C:\\\\MinGW\\\\bin\\\\g++.exe',
@@ -221,6 +244,16 @@ toolset_info = {
         'toolset' : 'clang',
         'version' : ''
         },
+    'xcode-9.0' : {
+        'command' : 'clang++',
+        'toolset' : 'clang',
+        'version' : ''
+        },
+    'xcode-9.1' : {
+        'command' : 'clang++',
+        'toolset' : 'clang',
+        'version' : ''
+        },
     }
 
 class SystemCallError(Exception):
diff --git a/tools/ci/library_test.py b/tools/ci/library_test.py
index 0db4af3..a3fc55b 100644
--- a/tools/ci/library_test.py
+++ b/tools/ci/library_test.py
@@ -94,14 +94,9 @@ class script(script_common):
         if self.repo != 'boost':
             utils.check_call("git","submodule","update","--quiet","--init",self.repo_path)
             if self.commit:
-                # Checkout the library commit we are testing.
-                os.chdir(self.repo_dir)
-                if not self.pull_request:
-                    utils.check_call("git","checkout","-qf",self.commit)
-                else:
-                    utils.check_call("git","fetch","origin","-q",
-                        "+refs/pull/{}/merge".format(self.pull_request))
-                    utils.check_call("git","checkout","-qf","FETCH_HEAD")
+                # Copy in the existing library tree checkout.
+                os.rmdir(self.repo_path)
+                shutil.copytree(self.root_dir, self.repo_path)
         
         # Fetch the dependencies for the library we are testing.
         if self.repo != 'boost':