From 73e43c0700ce95042320888e5c3f59b74925c94e Mon Sep 17 00:00:00 2001 From: ariasuni Date: Fri, 8 Jan 2021 17:45:59 +0100 Subject: [PATCH] Fix Vagrantfile and extended tests --- Vagrantfile | 10 ++++++---- devtools/dev-create-test-filesystem.sh | 1 + xtests/outputs/files_long_tree_icons.ansitxt | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index fd753bf..b1b4288 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -52,9 +52,12 @@ Vagrant.configure(2) do |config| else trap 'exit' ERR echo "Installing Rust" - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal --component rustc,rust-std,cargo,clippy -y + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal --component rustc,rust-std,cargo,clippy -y > /dev/null source $HOME/.cargo/env + echo "Installing cargo-hack" cargo install -q cargo-hack + echo "Installing specsheet" + cargo install -q --git https://github.com/ogham/specsheet fi EOF @@ -68,12 +71,11 @@ Vagrant.configure(2) do |config| else trap 'exit' ERR echo "Installing just" - wget -q "https://github.com/casey/just/releases/download/v0.8.0/just-v0.8.0-x86_64-unknown-linux-musl.tar.gz" - tar -xf "just-v0.8.0-x86_64-unknown-linux-musl.tar.gz" + wget -q "https://github.com/casey/just/releases/download/v0.8.3/just-v0.8.3-x86_64-unknown-linux-musl.tar.gz" + tar -xf "just-v0.8.3-x86_64-unknown-linux-musl.tar.gz" cp just /usr/local/bin fi - # Guarantee that the timezone is UTC — some of the tests # depend on this (for now). timedatectl set-timezone UTC diff --git a/devtools/dev-create-test-filesystem.sh b/devtools/dev-create-test-filesystem.sh index da691f4..afc19c0 100755 --- a/devtools/dev-create-test-filesystem.sh +++ b/devtools/dev-create-test-filesystem.sh @@ -34,6 +34,7 @@ for i in {1..13}; do done touch -t $FIXED_DATE "$TEST_ROOT/files/"* +touch -t $FIXED_DATE "$TEST_ROOT/files/" chmod 644 "$TEST_ROOT/files/"* sudo chown $FIXED_USER:$FIXED_USER "$TEST_ROOT/files/"* diff --git a/xtests/outputs/files_long_tree_icons.ansitxt b/xtests/outputs/files_long_tree_icons.ansitxt index ab16fda..3c7da81 100644 --- a/xtests/outputs/files_long_tree_icons.ansitxt +++ b/xtests/outputs/files_long_tree_icons.ansitxt @@ -1,4 +1,4 @@ -drwxrwxr-x - vagrant 18 Oct 00:18  /testcases/files +drwxrwxr-x - vagrant  1 Jan 12:34  /testcases/files .rw-r--r-- 1 cassowary  1 Jan 12:34 ├──  1_bytes .rw-r--r-- 1.0k cassowary  1 Jan 12:34 ├──  1_KiB .rw-r--r-- 1.0M cassowary  1 Jan 12:34 ├──  1_MiB