Merge pull request #25 from dhuseby/add_dragonfly_buildbot

adds support for dragonflybsd and openbsd buildbot

Author: alexcrichton

master/master.cfg

@@ -138,12 +138,15 @@ auto_platforms_prod = [
     "bitrig-64-opt",
     "linux-musl-64-opt",
     "freebsd10_32-1",
-    "freebsd10_64-1"
+    "freebsd10_64-1",
+    "dragonflybsd-64-opt",
+    "openbsd-64-opt"
 ]
 
 try_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "mac"]
 snap_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "mac", "bitrig-64",
-                       "freebsd10_32-1", "freebsd10_64-1"]
+                       "freebsd10_32-1", "freebsd10_64-1", "dragonflybsd-64-opt",
+                       "openbsd-64-opt"]
 dist_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-32", "win-msvc-64", "mac"]
 cargo_platforms_prod = ["linux-32", "linux-64", "mac-32", "mac-64", "win-gnu-32", 
                         "win-gnu-64", "win-msvc-32", "win-msvc-64", "bitrig-64"]
@@ -167,12 +170,15 @@ auto_platforms_dev = [
     "bitrig-64-opt",
     "linux-musl-64-opt",
     "freebsd10_32-1",
-    "freebsd10_64-1"
+    "freebsd10_64-1",
+    "dragonflybsd-64-opt",
+    "openbsd-64-opt"
 ]
 
 try_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64"]
 snap_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "bitrig-64",
-                      "freebsd10_32-1", "freebsd10_64-1"]
+                      "freebsd10_32-1", "freebsd10_64-1", "dragonflybsd-64-opt",
+                      "openbsd-64-opt"]
 dist_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-32", "win-msvc-64"]
 cargo_platforms_dev = ["linux-32", "linux-64", "win-gnu-32", "win-gnu-64", 
                        "bitrig-64", "win-msvc-32", "win-msvc-64"]
@@ -197,7 +203,9 @@ nogate_builders = [
     "auto-bitrig-64-opt", 
     "auto-linux-musl-64-opt",
     "auto-freebsd10_32-1",
-    "auto-freebsd10_64-1"
+    "auto-freebsd10_64-1",
+    "auto-dragonflybsd-64-opt",
+    "auto-openbsd-64-opt"
 ]
 dist_nogate_platforms = [
     "win-msvc-32", 
@@ -230,6 +238,10 @@ def all_platform_hosts(platform):
         return ["x86_64-pc-windows-msvc"]
     elif "bitrig-64" in platform:
         return ["x86_64-unknown-bitrig"]
+    elif "dragonflybsd-64" in platform:
+        return ["x86_64-unknown-dragonfly"]
+    elif "openbsd-64" in platform:
+        return ["x86_64-unknown-openbsd"]
     else:
         return None
 
@@ -277,6 +289,12 @@ def auto_platform_triple(p):
     if "bitrig-64" in p:
         return "x86_64-unknown-bitrig"
 
+    if "dragonfly-64" in p:
+        return "x86_64-unknown-dragonfly"
+
+    if "openbsd-64" in p:
+        return "x86_64-unknown-openbsd"
+
 def auto_platform_build(p):
     return auto_platform_triple(p)
 
@@ -317,7 +335,7 @@ for line in open("slave-list.txt"):
                                         keypair_name=keypair_name,
                                         #security_name=security_name,
                                         security_name="rust-non-vpc-slave",
-					build_wait_timeout=build_wait_timeout,
+                                        build_wait_timeout=build_wait_timeout,
                                         # notify_on_missing=['[email protected]'],
                                         max_builds=int(ext['max_builds']),
                                         tags = { 'Name': env + "-slave-" + name })
@@ -331,7 +349,7 @@ for line in open("slave-list.txt"):
             dist_slaves.append(slave)
 
         # "special" slaves are those we are _not_ putting in the auto pool.
-	if 'special' not in ext:
+        if 'special' not in ext:
             auto_slaves.append(slave)
 
         c['slaves'].append(slave)
@@ -687,7 +705,7 @@ class CommandEnv(object):
             if "msvc" in props["buildername"]:
                 env["MSVC"] = "1"
 
-	if "valgrind" in props and props["valgrind"] == True:
+        if "valgrind" in props and props["valgrind"] == True:
             env["RUST_THREADS"]="1"
             env["RUST_RT_TEST_THREADS"]="1"
 
@@ -730,7 +748,7 @@ class ConfigCommand(object):
               "docs", "optimize", "optimize-tests",
               "optimize-cxx", "optimize-llvm",
               "debug", "pax-flags", "clang",
-	      "inject-std-version", "llvm-static-stdcpp"]
+              "inject-std-version", "llvm-static-stdcpp"]
         if "cargo" in props:
             s = "./configure --local-rust-root=$PWD/rustc"
         else:
@@ -969,7 +987,7 @@ def make_and_check_buildfactory(check, android, windows, parallel):
     f.addStep(Compile(env=CommandEnv(),
                       haltOnFailure=True,
                       flunkOnFailure=True,
-		      timeout=compile_timeout,
+                      timeout=compile_timeout,
                       interruptSignal="TERM",
                       command=command,
                       workdir=BUILD_WORKDIR))
@@ -1008,7 +1026,7 @@ def cargo_buildfactory():
 
     f.addStep(ShellCommand(env=CommandEnv(),
                            command=["sh", ".travis.install.deps.sh"],
-			   workdir=WORKDIR))
+                           workdir=WORKDIR))
 
     f.addStep(Configure(env=CommandEnv(),
                         haltOnFailure=True,
@@ -1091,8 +1109,7 @@ def cargo_nightly_buildfactory(platform, host):
 
 def snap3_buildfactory(platform):
     global s3_addy
-    f = make_and_check_buildfactory(True, False, "win" in platform,
-				    False)
+    f = make_and_check_buildfactory(True, False, "win" in platform, False)
     hosts = all_platform_hosts(platform)
     if hosts != None:
         for host in hosts:
@@ -1149,12 +1166,11 @@ def cargo_distsnap_trigger_buildfactory(scheduler_names):
 def distsnap_buildfactory(platform, channel_label):
     global s3_addy
     # Don't run check because distcheck is going to do it all again
-    f = make_and_check_buildfactory(False, False, "win" in platform,
-				    False)
+    f = make_and_check_buildfactory(False, False, "win" in platform, False)
     f.addStep(Compile(env=CommandEnv(),
                       name="distcheck",
                       command=[MakeCommand(), "distcheck"],
-		      timeout=compile_timeout,
+                      timeout=compile_timeout,
                       interruptSignal="TERM",
                       workdir=BUILD_WORKDIR))
 
@@ -1534,8 +1550,8 @@ for p in snap_platforms:
                         "branch":"snap-stage3",
                         "hosts": "all",
                         "valgrind": False,
-			"inject-std-version": False,
-			"llvm-static-stdcpp": p == 'linux',
+                        "inject-std-version": False,
+                        "llvm-static-stdcpp": p == 'linux',
                         "check": True},
             factory=snap3_buildfactory(p)))
 
@@ -1551,7 +1567,7 @@ for p in dist_platforms:
                         "build": auto_platform_build(p),
                         "valgrind": False,
                         "check": True,
-			"llvm-static-stdcpp": p == 'linux',
+                        "llvm-static-stdcpp": p == 'linux',
                         "release-channel": "nightly"},
             nextSlave=nextSlave,
             slavenames=platform_dist_slaves(p),
@@ -1579,7 +1595,7 @@ for p in dist_platforms:
                         "build": auto_platform_build(p),
                         "valgrind": False,
                         "check": True,
-			"llvm-static-stdcpp": p == 'linux',
+                        "llvm-static-stdcpp": p == 'linux',
                         "release-channel": "beta"},
             nextSlave=nextSlave,
             slavenames=platform_dist_slaves(p),
@@ -1607,7 +1623,7 @@ for p in dist_platforms:
                         "build": auto_platform_build(p),
                         "valgrind": False,
                         "check": True,
-			"llvm-static-stdcpp": p == 'linux',
+                        "llvm-static-stdcpp": p == 'linux',
                         "release-channel": "stable"},
             nextSlave=nextSlave,
             slavenames=platform_dist_slaves(p),
@@ -1700,8 +1716,8 @@ for platform in cargo_platforms:
                         "branch":"auto-cargo",
                         "verbose": True,
                         "cargo": True,
-			"bits": bits,
-	                "build": triple},
+                        "bits": bits,
+                        "build": triple},
             slavenames=slaves,
             factory=cargo_buildfactory()))
 
@@ -1759,8 +1775,8 @@ c['status'].append(html.WebStatus(
 
 from buildbot.status import words
 c['status'].append(words.IRC(host="irc.mozilla.org",
-			     port=6697,
-			     useSSL=True,
+                             port=6697,
+                             useSSL=True,
                              nick="rust-buildbot",
                              channels=["#rust-bots"]))