Merge branch 'master' into friday_night

mtunique · Jun 14, 2018 · c37afc6 · c37afc6
2 parents 2f2dda0 + ad83af4
commit c37afc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/script/installation/packages.sh b/script/installation/packages.sh
@@ -47,6 +47,9 @@ TF_TYPE="cpu"
 function install_protobuf3.4.0() {
     # Install Relevant tooling
     # Remove any old versions of protobuf
+    # Note: Protobuf 3.5+ PPA available Ubuntu Bionic(18.04) onwards - Should be used
+    # when we retire 16.04 too: https://launchpad.net/~maarten-fonville/+archive/ubuntu/protobuf
+    # This PPA unfortunately doesnt have Protobuf 3.5 for 16.04, but does for 14.04/18.04+
     DISTRIB=$1 # ubuntu/fedora
     if [ "$DISTRIB" == "ubuntu" ]; then
         sudo apt-get --yes --force-yes remove --purge libprotobuf-dev protobuf-compiler
@@ -63,7 +66,7 @@ function install_protobuf3.4.0() {
     wget -O protobuf-cpp-3.4.0.tar.gz https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
     tar -xzf protobuf-cpp-3.4.0.tar.gz
     cd protobuf-3.4.0
-    ./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig
+    ./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig || exit 1
     cd ..
     # Cleanup
     rm -rf protobuf-3.4.0 protobuf-cpp-3.4.0.tar.gz

diff --git a/test/codegen/csv_scan_translator_test.cpp b/test/codegen/csv_scan_translator_test.cpp
@@ -36,7 +36,7 @@ class CSVScanTranslatorTest : public PelotonCodeGenTest {
 TEST_F(CSVScanTranslatorTest, IntCsvScan) {
   // The quoting character and a helper function to quote a given string
   const char quote = '"';
-  const auto quote_string = [quote](std::string s) {
+  const auto quote_string = [](std::string s) {
     return StringUtil::Format("%c%s%c", quote, s.c_str(), quote);
   };