Skip to content

Commit

Permalink
Fix Vagrantfile and extended tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ariasuni committed Jan 11, 2021
1 parent 39c8c67 commit 73e43c0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions devtools/dev-create-test-filesystem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/"*

Expand Down
2 changes: 1 addition & 1 deletion xtests/outputs/files_long_tree_icons.ansitxt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 73e43c0

Please sign in to comment.