From 53555fec1c1db206e02d3a32bf65c43db56e04cc Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Tue, 3 Jan 2017 14:17:19 +0100 Subject: [PATCH] tests: factor out dl-linux-tarball.bash This will be also used by the reverse benchmarks. --- tests/canonical-benchmarks.bash | 18 +++++++----------- tests/dl-linux-tarball.bash | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) create mode 100755 tests/dl-linux-tarball.bash diff --git a/tests/canonical-benchmarks.bash b/tests/canonical-benchmarks.bash index cdde33d..b7c2d38 100755 --- a/tests/canonical-benchmarks.bash +++ b/tests/canonical-benchmarks.bash @@ -6,24 +6,20 @@ # # This is called by the top-level script "benchmark.bash". +cd "$(dirname "$0")" +MYNAME=$(basename "$0") + if [ $# -ne 1 ]; then - MYNAME=$(basename $0) echo "usage: $MYNAME TESTDIR" exit 1 fi +# Download /tmp/linux-3.0.tar.gz +./dl-linux-tarball.bash + # cd to TESTDIR cd "$1" -TGZ=/tmp/linux-3.0.tar.gz - -if [ "$(md5sum /tmp/linux-3.0.tar.gz | cut -f1 -d' ')" != \ - "f7e6591d86a9dbe123dfd1a0be054e7f" ]; then - echo "Downloading linux-3.0.tar.gz" - wget -nv --show-progress -c -O $TGZ \ - https://cdn.kernel.org/pub/linux/kernel/v3.0/linux-3.0.tar.gz -fi - function etime { LC_ALL=C /usr/bin/time -f %e 2>&1 $@ > /dev/null } @@ -33,7 +29,7 @@ dd if=/dev/zero of=zero bs=131072 count=2000 2>&1 | tail -n 1 rm zero sleep 1 echo -n "UNTAR: " -etime tar xzf $TGZ +etime tar xzf /tmp/linux-3.0.tar.gz sleep 1 echo -n "LS: " etime ls -lR linux-3.0 diff --git a/tests/dl-linux-tarball.bash b/tests/dl-linux-tarball.bash new file mode 100755 index 0000000..5fbd2b4 --- /dev/null +++ b/tests/dl-linux-tarball.bash @@ -0,0 +1,15 @@ +#!/bin/bash -eu +# +# This script checks the MD5 sum of /tmp/linux-3.0.tar.gz and downloads +# a fresh copy if its incorrect or the file is missing. + +TGZ=/tmp/linux-3.0.tar.gz + +MD5_ACTUAL="$(md5sum $TGZ | cut -f1 -d' ')" +MD5_WANT="f7e6591d86a9dbe123dfd1a0be054e7f" + +if [[ $MD5_ACTUAL != $MD5_WANT ]]; then + echo "Downloading linux-3.0.tar.gz" + wget -nv --show-progress -c -O $TGZ \ + https://cdn.kernel.org/pub/linux/kernel/v3.0/linux-3.0.tar.gz +fi