From 920f2e0e1aac5fe8a3be6468dbef02f55663219c Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@fb.com>
Date: Fri, 25 Jan 2019 12:57:02 -0800
Subject: [PATCH] rsocket: add fbcode builder bits

Summary:
This should allow more direct testing of changes without waiting for things to land on github first.

As part of this, to avoid a conflict between the deps that bistro downloads and those used by
the rest of the fbcode builder CI, I've updated the version of gtest used by bistro.

Reviewed By: zertosh

Differential Revision: D13802637

fbshipit-source-id: fd71bfabd2a85f4f63c21b44a1e868f2d293180a
---
 build/fbcode_builder/specs/fbthrift.py | 13 ++-----------
 build/fbcode_builder/specs/rsocket.py  | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 build/fbcode_builder/specs/rsocket.py

diff --git a/build/fbcode_builder/specs/fbthrift.py b/build/fbcode_builder/specs/fbthrift.py
index 1a4cd98f4..e4fa2fb50 100644
--- a/build/fbcode_builder/specs/fbthrift.py
+++ b/build/fbcode_builder/specs/fbthrift.py
@@ -7,6 +7,7 @@ from __future__ import unicode_literals
 
 import specs.folly as folly
 import specs.fizz as fizz
+import specs.rsocket as rsocket
 import specs.sodium as sodium
 import specs.wangle as wangle
 import specs.zstd as zstd
@@ -20,25 +21,15 @@ def fbcode_builder_spec(builder):
         'no1msd/mstch:git_hash',
         ShellQuoted('$(git describe --abbrev=0 --tags)')
     )
-    builder.add_option(
-        'rsocket/rsocket-cpp/build:cmake_defines', {'BUILD_TESTS': 'OFF'}
-    )
     builder.add_option('krb5/krb5:git_hash', 'krb5-1.16.1-final')
     return {
-        'depends_on': [folly, fizz, sodium, wangle, zstd],
+        'depends_on': [folly, fizz, sodium, rsocket, wangle, zstd],
         'steps': [
             # This isn't a separete spec, since only fbthrift uses mstch.
             builder.github_project_workdir('no1msd/mstch', 'build'),
             builder.cmake_install('no1msd/mstch'),
             builder.github_project_workdir('krb5/krb5', 'src'),
             builder.autoconf_install('krb5/krb5'),
-            builder.github_project_workdir(
-                'rsocket/rsocket-cpp', 'build'
-            ),
-            builder.step('configuration for rsocket', [
-                builder.cmake_configure('rsocket/rsocket-cpp/build'),
-            ]),
-            builder.cmake_install('rsocket/rsocket-cpp'),
             builder.fb_github_cmake_install('fbthrift/thrift'),
         ],
     }
diff --git a/build/fbcode_builder/specs/rsocket.py b/build/fbcode_builder/specs/rsocket.py
new file mode 100644
index 000000000..740958526
--- /dev/null
+++ b/build/fbcode_builder/specs/rsocket.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# Copyright (c) Facebook, Inc. and its affiliates.
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import specs.gmock as gmock
+import specs.folly as folly
+
+
+def fbcode_builder_spec(builder):
+    return {
+        'depends_on': [folly, gmock],
+        'steps': [
+            builder.fb_github_cmake_install(
+                'rsocket-cpp/rsocket',
+                github_org='rsocket'),
+        ],
+    }