Import upstream version 1.29

[debian/tar] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 5fbe6a594abd150bedace1854392d474a306fe0f..21c6ef780e901b4c2cf7ee6600f889ed28c3df91 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,6 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for tar test suite.
-# Copyright 2004, 2006, 2013-2014 Free Software Foundation, Inc.
+# Copyright 2004, 2006, 2013-2014, 2016 Free Software Foundation, Inc.
 
 # This file is part of GNU tar.
 
@@ -25,22 +25,27 @@ trap "test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15
 
 TEST_DATA_URL=ftp://download.gnu.org.ua/pub/tests/tar
 if test -z "$TEST_DATA_DIR"; then
-  TEST_DATA_DIR=$abs_builddir
+  TEST_DATA_DIR=$abs_builddir/download
 fi
 
-STAR_DATA_URL=ftp://ftp.berlios.de/pub/star/testscripts
+STAR_DATA_URL=$TEST_DATA_URL/star
 if test -z "$STAR_TESTSCRIPTS"; then
   STAR_TESTSCRIPTS=$TEST_DATA_DIR
 fi
 
 # tarball_prereq file sum dir url
 tarball_prereq() {
-  if test -d "$3"; then
-    if test -r $3/$1; then
-      :
-    elif test -n "$FULL_TEST"; then
-      wget -q --directory-prefix=$3 $4/$1
-    fi
+  if ! test -d "$3"; then
+    mkdir "$3"
+    cat > "$3/README" <<EOF
+This directory contains test data downloaded during full check.
+You can remove it, if you wish.
+EOF
+  fi
+  if test -r $3/$1; then
+    :
+  elif test -n "$FULL_TEST"; then
+    wget -q -O $3/$1 $4/$1
   fi
   echo "$2  $3/$1" | md5sum --status --check - >/dev/null 2>&1
 }
@@ -56,4 +61,4 @@ mkexcltest() {
   genfile --file=$1/subdir/excludeme
   genfile --file=$1/subdir/subdir-file
 }
-  
\ No newline at end of file
+