Auto merge of #14 - Hoverbear:tests, r=Hoverbear

Cache target dir

Author: homu

bin/compile

@@ -40,7 +40,7 @@ if [[ ! -d "$CACHE_DIR/multirust" ]]; then
     ./build.sh
     ./install.sh --destdir="$CACHE_DIR/multirust" --prefix=""
 else
-    log "Pre-existing multirust."
+    log "Pre-existing multirust"
 fi
 export PATH="$PATH:$CACHE_DIR/multirust/bin"
 
@@ -50,16 +50,26 @@ export HOME="$CACHE_DIR"
 # Use Multirust
 MULTIRUST_VERION="$(cat $BUILD_DIR/Cargo.toml | grep -ohzP "(?<=\[target.heroku\])[^\[]*" | grep -ohzP "(?<=version = \")[^\"]*")" || true
 if [[ -z "$MULTIRUST_VERION" ]]; then
-    log "Setting version to \"nightly\" (default)."
+    log "Setting version to \"nightly\" (default)"
     multirust default "nightly"
 else
-    log "Setting version to \"$MULTIRUST_VERION\"."
+    log "Setting version to \"$MULTIRUST_VERION\""
     multirust default "$MULTIRUST_VERION"
 fi
 
 # Change into correct directory.
 cd "$BUILD_DIR"
 
+if [[ ! -d "$CACHE_DIR/target" ]]; then
+    log "No cached crates detected"
+else
+    log "Detected cached crates... Restoring..."
+    mv "$CACHE_DIR/target" "$BUILD_DIR/target"
+fi
+
 # Build the Rust app
-log "Compiling Application..."
+log "Compiling application..."
 CARGO_HOME="$CACHE_DIR/cargo" cargo build --release
+
+log "Caching build artifacts"
+cp -r "$BUILD_DIR/target" "$CACHE_DIR/target"

test/compile_test.sh

@@ -12,10 +12,16 @@ setup()
     name = "$PROJECT"
     version = "0.1.0"
     authors = ["Andrew Hobden <[email protected]>"]
+
+    [dependencies]
+    rand = "*"
 EOF
     cat > $BUILD_DIR/src/main.rs <<EOF
+    extern crate rand;
+
     fn main() {
-        println!("Hello world!");
+        let number = rand::random::<u64>();
+        println!("Hello world! Some random number is {}", number);
     }
 
     #[test]
@@ -38,13 +44,17 @@ testDefault()
 
     compile
 
-    assertCaptured "-----> Fetching multirust."
-    assertCaptured "-----> Setting version to \"nightly\" (default)."
-    assertCaptured "-----> Compiling Application."
+    assertCaptured "-----> Fetching multirust"
+    assertCaptured "-----> Setting version to \"nightly\" (default)"
+    assertCaptured "-----> No cached crates detected"
+    assertCaptured "-----> Compiling application"
+    assertCaptured "-----> Caching build artifacts"
 
     compile
 
-    assertCaptured "-----> Pre-existing multirust."
+    assertCaptured "-----> Pre-existing multirust"
+    assertCaptured "multirust: using existing install for"
+    assertCaptured "-----> Detected cached crates... Restoring..."
 
     cleanup
 }
@@ -59,9 +69,11 @@ EOF
 
     compile
 
-    assertCaptured "-----> Fetching multirust."
-    assertCaptured "-----> Setting version to \"nightly\"."
-    assertCaptured "-----> Compiling Application."
+    assertCaptured "-----> Fetching multirust"
+    assertCaptured "-----> Setting version to \"nightly\""
+    assertCaptured "-----> No cached crates detected"
+    assertCaptured "-----> Compiling application"
+    assertCaptured "-----> Caching build artifacts"
 
     cleanup
 }
@@ -76,9 +88,11 @@ EOF
 
     compile
 
-    assertCaptured "-----> Fetching multirust."
-    assertCaptured "-----> Setting version to \"beta\"."
-    assertCaptured "-----> Compiling Application."
+    assertCaptured "-----> Fetching multirust"
+    assertCaptured "-----> Setting version to \"beta\""
+    assertCaptured "-----> No cached crates detected"
+    assertCaptured "-----> Compiling application"
+    assertCaptured "-----> Caching build artifacts"
 
     cleanup
 }
@@ -93,9 +107,11 @@ EOF
 
     compile
 
-    assertCaptured "-----> Fetching multirust."
-    assertCaptured "-----> Setting version to \"stable\"."
-    assertCaptured "-----> Compiling Application."
+    assertCaptured "-----> Fetching multirust"
+    assertCaptured "-----> Setting version to \"stable\""
+    assertCaptured "-----> No cached crates detected"
+    assertCaptured "-----> Compiling application"
+    assertCaptured "-----> Caching build artifacts"
 
     cleanup
 }