Fix Vagrantfile and extended tests

2024-11-24 21:07:34 +00:00 · 2021-01-08 17:45:59 +01:00 · 2021-01-08 17:45:59 +01:00 · 73e43c0700
commit 73e43c0700
parent 39c8c67bf6
3 changed files with 8 additions and 5 deletions
--- a/10
+++ b/10
@ -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
--- 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/"*

--- a/xtests/outputs/files_long_tree_icons.ansitxt
+++ b/xtests/outputs/files_long_tree_icons.ansitxt
@ -1,4 +1,4 @@
-[1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m    [38;5;244m-[0m [1;33mvagrant[0m   [34m18 Oct 00:18[0m [34m[0m [36m/testcases/[1;34mfiles[0m
+[1;34md[33mr[31mw[32mx[0m[33mr[31mw[32mx[33mr[38;5;244m-[32mx[0m    [38;5;244m-[0m [1;33mvagrant[0m   [34m 1 Jan 12:34[0m [34m[0m [36m/testcases/[1;34mfiles[0m
 .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m    [1;32m1[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m├──[0m  1_bytes
 .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mk[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m├──[0m  1_KiB
 .[1;33mr[31mw[0m[38;5;244m-[33mr[38;5;244m--[33mr[38;5;244m--[0m [1;32m1.0[0m[32mM[0m cassowary [34m 1 Jan 12:34[0m [38;5;244m├──[0m  1_MiB