From 68f3eb746c6896a1602e17161dfa3c0796884295 Mon Sep 17 00:00:00 2001
From: sdong <siying.d@fb.com>
Date: Tue, 19 Jul 2016 18:32:51 -0700
Subject: [PATCH] Run release build for CLANG and GCC 4.8.1 in pre-commit tests
 too

Summary: As Title.

Test Plan: See how the diff works.

Reviewers: kradhakrishnan, andrewkr, gunnarku

Reviewed By: gunnarku

Subscribers: leveldb, andrewkr, dhruba

Differential Revision: https://reviews.facebook.net/D60933
---
 Makefile                                     |  2 +-
 arcanist_util/config/RocksDBCommonHelper.php |  2 +-
 build_tools/error_filter.py                  |  2 +
 build_tools/rocksdb-lego-determinator        | 56 ++++++++++++++++++--
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 541069510..6445c5c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -1361,7 +1361,7 @@ jdb_bench:
 
 commit_prereq: build_tools/rocksdb-lego-determinator \
                build_tools/precommit_checker.py
-	J=$(J) build_tools/precommit_checker.py unit unit_481 clang_unit tsan asan ubsan lite
+	J=$(J) build_tools/precommit_checker.py unit unit_481 clang_unit release release_481 clang_release tsan asan ubsan lite
 	$(MAKE) clean && $(MAKE) jclean && $(MAKE) rocksdbjava;
 
 xfunc:
diff --git a/arcanist_util/config/RocksDBCommonHelper.php b/arcanist_util/config/RocksDBCommonHelper.php
index 087272b82..6c398c5da 100644
--- a/arcanist_util/config/RocksDBCommonHelper.php
+++ b/arcanist_util/config/RocksDBCommonHelper.php
@@ -224,7 +224,7 @@ function getSandcastleConfig() {
     // Manually list of tests we want to run in Sandcastle.
     $tests = array(
       "unit", "unit_481", "clang_unit", "tsan", "asan", "lite_test",
-      "valgrind", "release"
+      "valgrind", "release", "release_481", "clang_release"
     );
   }
 
diff --git a/build_tools/error_filter.py b/build_tools/error_filter.py
index 966c0c5f1..f655ba095 100644
--- a/build_tools/error_filter.py
+++ b/build_tools/error_filter.py
@@ -119,7 +119,9 @@ _TEST_NAME_TO_PARSERS = {
     'unit': [CompilerErrorParser, GTestErrorParser],
     'release': [CompilerErrorParser, GTestErrorParser],
     'unit_481': [CompilerErrorParser, GTestErrorParser],
+    'release_481': [CompilerErrorParser, GTestErrorParser],
     'clang_unit': [CompilerErrorParser, GTestErrorParser],
+    'clang_release': [CompilerErrorParser, GTestErrorParser],
     'clang_analyze': [CompilerErrorParser, ScanBuildErrorParser],
     'code_cov': [CompilerErrorParser, GTestErrorParser],
     'unity': [CompilerErrorParser, GTestErrorParser],
diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator
index 3c493172c..05365f779 100755
--- a/build_tools/rocksdb-lego-determinator
+++ b/build_tools/rocksdb-lego-determinator
@@ -149,15 +149,15 @@ UNIT_TEST_COMMANDS="[
 #
 # RocksDB release build and unit tests
 #
-RELEASE_UNIT_TEST_COMMANDS="[
+RELEASE_BUILD_COMMANDS="[
     {
-        'name':'Rocksdb Release Unit Test',
+        'name':'Rocksdb Release Build',
         'oncall':'$ONCALL',
         'steps': [
             $CLEANUP_ENV,
             {
-                'name':'Build and test RocksDB debug version',
-                'shell':'$SHM $DEBUG make J=1 release',
+                'name':'Build RocksDB release',
+                'shell':'make J=1 release',
                 'user':'root',
                 $PARSER
             },
@@ -186,6 +186,26 @@ UNIT_TEST_COMMANDS_481="[
     }
 ]"
 
+#
+# RocksDB release build and unit tests
+#
+RELEASE_BUILD_COMMANDS_481="[
+    {
+        'name':'Rocksdb Release on GCC 4.8.1',
+        'oncall':'$ONCALL',
+        'steps': [
+            $CLEANUP_ENV,
+            {
+                'name':'Build RocksDB release on GCC 4.8.1',
+                'shell':'$GCC_481 make J=1 release',
+                'user':'root',
+                $PARSER
+            },
+        ],
+        $REPORT
+    }
+]"
+
 #
 # RocksDB unit test with CLANG
 #
@@ -206,6 +226,26 @@ CLANG_UNIT_TEST_COMMANDS="[
     }
 ]"
 
+#
+# RocksDB release build with CLANG
+#
+CLANG_RELEASE_BUILD_COMMANDS="[
+    {
+        'name':'Rocksdb CLANG Release Build',
+        'oncall':'$ONCALL',
+        'steps': [
+            $CLEANUP_ENV,
+            {
+                'name':'Build RocksDB release',
+                'shell':'$CLANG make J=1 release',
+                'user':'root',
+                $PARSER
+            },
+        ],
+        $REPORT
+    }
+]"
+
 #
 # RocksDB analyze
 #
@@ -686,14 +726,20 @@ case $1 in
     echo $UNIT_TEST_COMMANDS
     ;;
   release)
-    echo $RELEASE_UNIT_TEST_COMMANDS
+    echo $RELEASE_BUILD_COMMANDS
     ;;
   unit_481)
     echo $UNIT_TEST_COMMANDS_481
     ;;
+  release_481)
+    echo $RELEASE_BUILD_COMMANDS_481
+    ;;
   clang_unit)
     echo $CLANG_UNIT_TEST_COMMANDS
     ;;
+  clang_release)
+    echo $CLANG_RELEASE_BUILD_COMMANDS
+    ;;
   clang_analyze)
     echo $CLANG_ANALYZE_COMMANDS
     ;;