From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 3C79D2042F for ; Thu, 17 Nov 2016 02:41:55 +0000 (UTC) From: Eric Wong To: rainbows-public@bogomips.org Subject: [PATCH] tests: use correct file:// URL for random_blob path Date: Thu, 17 Nov 2016 02:41:55 +0000 Message-Id: <20161117024155.21980-1-e@80x24.org> List-Id: Apparently RFC1738 designates hostname support for file:// and curl historically had this wrong, but my current curl version (7.38.0-4+deb8u5 from Debian 8) is stricter. Anyways, this seems to handle $PWD with spaces and possibly other strange characters, so URL encoding here doesn't seem to be strictly necssary. --- t/byte-range-common.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/t/byte-range-common.sh b/t/byte-range-common.sh index 2c12a8b..3418394 100644 --- a/t/byte-range-common.sh +++ b/t/byte-range-common.sh @@ -34,14 +34,15 @@ check_content_range () { } t_begin "read random blob sha1s" && { - sha1_head=$(curl -sSff $range_head file://random_blob | rsha1) - sha1_tail=$(curl -sSff $range_tail file://random_blob | rsha1) - sha1_mid=$(curl -sSff $range_mid file://random_blob | rsha1) - sha1_n1=$(curl -sSff $range_n1 file://random_blob | rsha1) - sha1_n2=$(curl -sSff $range_n2 file://random_blob | rsha1) - sha1_1b_head=$(curl -sSff $range_1b_head file://random_blob | rsha1) - sha1_1b_tail=$(curl -sSff $range_1b_tail file://random_blob | rsha1) - sha1_1b_mid=$(curl -sSff $range_1b_mid file://random_blob | rsha1) + file="file://$(pwd)/random_blob" + sha1_head=$(curl -sSff $range_head $file | rsha1) + sha1_tail=$(curl -sSff $range_tail $file | rsha1) + sha1_mid=$(curl -sSff $range_mid $file | rsha1) + sha1_n1=$(curl -sSff $range_n1 $file | rsha1) + sha1_n2=$(curl -sSff $range_n2 $file | rsha1) + sha1_1b_head=$(curl -sSff $range_1b_head $file | rsha1) + sha1_1b_tail=$(curl -sSff $range_1b_tail $file | rsha1) + sha1_1b_mid=$(curl -sSff $range_1b_mid $file | rsha1) sha1_all=$(rsha1 < random_blob) echo "$sha1_all=$sha1_n1" } -- EW