Auto merge of rust-lang#384 - semarie:openbsd-6.0-without-pkgs, r=alexcrichton

use new openbsd-6.0 qcow2 image

this version is using `openbsd-6.0-without-pkgs` image.

Author: bors

ci/docker/x86_64-unknown-freebsd/Dockerfile

@@ -8,6 +8,6 @@ RUN apt-get install -y --no-install-recommends \
 ENTRYPOINT ["sh"]
 
 ENV PATH=$PATH:/rust/bin \
-    QEMU=freebsd.qcow2 \
+    QEMU=freebsd.qcow2.gz \
     CAN_CROSS=1 \
     CARGO_TARGET_X86_64_UNKNOWN_FREEBSD_LINKER=x86_64-unknown-freebsd10-gcc

ci/docker/x86_64-unknown-openbsd/Dockerfile

@@ -4,4 +4,4 @@ RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
   gcc libc6-dev qemu qemu-kvm curl ca-certificates kmod cpu-checker
 ENV PATH=$PATH:/rust/bin \
-    QEMU=openbsd.qcow2
+    QEMU=2016-09-07/openbsd-6.0-without-pkgs.qcow2

ci/run-qemu.sh

@@ -19,10 +19,7 @@ export CARGO_TARGET_DIR=/tmp
 
 case $TARGET in
   *-openbsd)
-    pkg_add rust curl gcc-4.8.4p4
-    curl https://static.rust-lang.org/cargo-dist/2015-04-02/cargo-nightly-x86_64-unknown-openbsd.tar.gz | \
-      tar xzf - -C /tmp
-    export PATH=$PATH:/tmp/cargo-nightly-x86_64-unknown-openbsd/cargo/bin
+    pkg_add cargo gcc%4.9 rust
     export CC=egcc
     ;;
 

ci/run.sh

@@ -16,9 +16,21 @@ TARGET=$1
 if [ "$QEMU" != "" ]; then
   tmpdir=/tmp/qemu-img-creation
   mkdir -p $tmpdir
-  if [ ! -f $tmpdir/$QEMU ]; then
-    curl https://people.mozilla.org/~acrichton/libc-test/qemu/$QEMU.gz | \
-      gunzip -d > $tmpdir/$QEMU
+
+  if [ -z "${QEMU#*.gz}" ]; then
+    # image is .gz : download and uncompress it
+    qemufile=$(echo ${QEMU%.gz} | sed 's/\//__/g')
+    if [ ! -f $tmpdir/$qemufile ]; then
+      curl https://people.mozilla.org/~acrichton/libc-test/qemu/$QEMU | \
+        gunzip -d > $tmpdir/$qemufile
+    fi
+  else
+    # plain qcow2 image: just download it
+    qemufile=$(echo ${QEMU} | sed 's/\//__/g')
+    if [ ! -f $tmpdir/$qemufile ]; then
+      curl https://people.mozilla.org/~acrichton/libc-test/qemu/$QEMU \
+        > $tmpdir/$qemufile
+    fi
   fi
 
   # Create a mount a fresh new filesystem image that we'll later pass to QEMU.
@@ -80,7 +92,7 @@ if [ "$QEMU" != "" ]; then
   $program \
     -m 1024 \
     -snapshot \
-    -drive if=virtio,file=$tmpdir/$QEMU \
+    -drive if=virtio,file=$tmpdir/$qemufile \
     -drive if=virtio,file=$tmpdir/libc-test.img \
     -net nic,model=virtio \
     -net user \

src/unix/bsd/openbsdlike/openbsd.rs

@@ -360,7 +360,6 @@ pub const KERN_OSVERSION: ::c_int = 27;
 pub const KERN_SOMAXCONN: ::c_int = 28;
 pub const KERN_SOMINCONN: ::c_int = 29;
 pub const KERN_USERMOUNT: ::c_int = 30;
-pub const KERN_RND: ::c_int = 31;
 pub const KERN_NOSUIDCOREDUMP: ::c_int = 32;
 pub const KERN_FSYNC: ::c_int = 33;
 pub const KERN_SYSVMSG: ::c_int = 34;