Use workspaces in this repo

Cargo.toml

@@ -16,3 +16,6 @@ other common platform libraries.
 [features]
 default = ["use_std"]
 use_std = []
+
+[workspace]
+members = ["libc-test", "libc-test/generate-files"]

appveyor.yml

@@ -19,3 +19,7 @@ build: false
 test_script:
   - cargo test
   - cargo run --manifest-path libc-test/Cargo.toml
+
+cache:
+  - target
+  - C:\Users\appveyor\.cargo\registry

ci/docker/i686-unknown-linux-musl/Dockerfile

@@ -18,4 +18,5 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.15.tar.gz | \
     make CROSS_COMPILE= install -j4 && \
     cd .. && \
     rm -rf musl-1.1.15
-ENV PATH=$PATH:/musl-i686/bin:/rust/bin
+ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
+    CC_i686_unknown_linux_musl=musl-gcc

ci/docker/x86_64-unknown-freebsd/Dockerfile

@@ -3,7 +3,7 @@ USER root
 
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
-  qemu qemu-kvm kmod cpu-checker
+  qemu genext2fs
 
 ENTRYPOINT ["sh"]
 

ci/docker/x86_64-unknown-openbsd/Dockerfile

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

ci/run-docker.sh

@@ -7,6 +7,7 @@ run() {
     echo $1
     docker build -t libc ci/docker/$1
     docker run \
+      --rm \
       -v `rustc --print sysroot`:/rust:ro \
       -v `pwd`:/checkout:ro \
       -e CARGO_TARGET_DIR=/tmp/target \

ci/run.sh

@@ -37,11 +37,7 @@ if [ "$QEMU" != "" ]; then
   # This will have a `run.sh` script will which use the artifacts inside to run
   # on the host.
   rm -f $tmpdir/libc-test.img
-  dd if=/dev/null of=$tmpdir/libc-test.img bs=1M seek=50
-  mkfs.ext2 -F $tmpdir/libc-test.img
-  rm -rf $tmpdir/mount
   mkdir $tmpdir/mount
-  mount -t ext2 -o loop $tmpdir/libc-test.img $tmpdir/mount
 
   # If we have a cross compiler, then we just do the standard rigamarole of
   # cross-compiling an executable and then the script to run just executes the
@@ -74,22 +70,18 @@ if [ "$QEMU" != "" ]; then
     cp libc-test/run-generated-Cargo.toml $tmpdir/mount/libc/libc-test/Cargo.toml
   fi
 
-  umount $tmpdir/mount
-
-  # If we can use kvm, prefer that, otherwise just fall back to user-space
-  # emulation.
-  if kvm-ok; then
-    program=kvm
-  else
-    program=qemu-system-x86_64
-  fi
+  du -sh $tmpdir/mount
+  genext2fs \
+      --root $tmpdir/mount \
+      --size-in-blocks 100000 \
+      $tmpdir/libc-test.img
 
   # Pass -snapshot to prevent tampering with the disk images, this helps when
   # running this script in development. The two drives are then passed next,
   # first is the OS and second is the one we just made. Next the network is
   # configured to work (I'm not entirely sure how), and then finally we turn off
   # graphics and redirect the serial console output to out.log.
-  $program \
+  qemu-system-x86_64 \
     -m 1024 \
     -snapshot \
     -drive if=virtio,file=$tmpdir/$qemufile \