mac lego build test and fix

Summary:
testing mac lego build
fixing typos from D4287428

Reviewed By: hehe-wz, nedelchev

Differential Revision: D4289371

fbshipit-source-id: 331eef1f0f8e2f5268188562ecc9648632644255

Author: ldemailly

WdtBase.h

@@ -29,7 +29,7 @@ namespace wdt {
 
 /**
  * Shared code/functionality between Receiver and Sender
- * TODO: a lot more code from sender/receiver should move here
+ * TODO: check if more of Receiver/Sender should move here
  */
 class WdtBase {
  public:

build/lego-job-spec.sh

@@ -19,7 +19,7 @@ cat <<EOF
             {
                 "user": "facebook",
                 "name": "Build Wdt OpenSource Linux",
-                "shell": "mkdir wdt_build; cd wdt_build; pwd; cmake ../wdt -DFOLLY_SOURCE_DIR=$BOX_DIR -DBUILD_TESTING=on && make -j",
+                "shell": "wdt/build/lego-linux-build.sh",
                 "required": true
             },
             {
@@ -38,13 +38,12 @@ cat <<EOF
     "user": "ldemailly",
     "capabilities": {
         "vcs": "fbcode-fbsource",
-        "type": "lego-mac",
+        "type": "lego-mac"
     },
     "args": {
         "name": "wdt-opensource-mac",
         "oncall": "wdt",
         "timeout": 10800,
-        "steps": [
         "steps": [
             {
                 "user": "facebook",

build/lego-linux-build.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+# If using variables directly from the spec, the variables are replaced by the
+# wrong value (from initial step)
+echo "BOX_DIR=$BOX_DIR"
+set -x
+pwd
+uname -a
+mkdir wdt_build
+cd wdt_build || exit 1
+ls -l "$BOX_DIR"
+cmake ../wdt -DFOLLY_SOURCE_DIR="$BOX_DIR" -DBUILD_TESTING=on && make -j

build/wdt_cont_build_setup.sh

@@ -4,6 +4,7 @@
 # run this once and then _run will run a loop and email results
 echo "if sending email later fails, you might need:"
 echo "sudo sed -ie 's#^\(mailhub\).*$#\1=localhost#' /etc/ssmtp/ssmtp.conf"
+echo "but that shouldn't be necessary anymore"
 set -x
 sudo yum install iproute-tc devtoolset-4-gcc-c++ automake autoconf boost-devel
 export PATH=/opt/rh/devtoolset-4/root/bin:$PATH