Merge branch 'master' into dev/cross-client-sync

Author: ErikBjare

Diff for: .travis.yml

@@ -44,15 +44,29 @@ install:
         cargo build --bin aw-sync-rust $($RELEASE && echo '--release');
     fi
 
+before_script:
+  - |
+    if [ "$TRAVIS_OS_NAME" = "windows" ]; then  # Needed because otherwise the Windows build fails when a later build step tries to overwrite the file
+        cargo build --bin aw-server-rust $($RELEASE && echo '--release');
+        mv target/*/aw-server-rust.exe target/aw-server-rust-copy.exe;
+        env RUST_BACKTRACE=1 ./target/aw-server-rust-copy.exe &
+        SERVER_PID=$!;
+    else
+        env RUST_BACKTRACE=1 cargo run --bin aw-server-rust $($RELEASE && echo '--release') &
+        SERVER_PID=$!;
+    fi
+
 script:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$BUILD_ANDROID" != "true" ] && [ -z "$RELEASE" ]; then
         echo "Running tests with coverage";
-        cargo kcov --verbose;
+        cargo kcov --all --verbose;
         bash <(curl -s https://codecov.io/bash);
     else
-        cargo test --verbose $($RELEASE && echo '--release');
+        cargo test --all --verbose $($RELEASE && echo '--release');
     fi
 
+after_script:
+  - kill $SERVER_PID
 
 before_cache:
   - cargo prune

Diff for: Cargo.lock

@@ -5,6 +5,11 @@ authors = ["Johan Bjäreholt <[email protected]>", "Erik Bjäreholt <erik@bjareho
 edition = "2018"
 default-run = "aw-server-rust"
 
+[workspace]
+members = [
+    "aw-client-rust",
+]
+
 [lib]
 name = "aw_server"
 crate-type = ["lib", "cdylib"]