Merge remote-tracking branch 'origin/master' into sheet

[pspp] / tests / libpspp / zip.at

diff --git a/tests/libpspp/zip.at b/tests/libpspp/zip.at
index a725049e525193737d9dd29597e9b9d643bce72c..a2f9d6f17993a875340484d0bfd67a482a25b989 100644 (file)
--- a/tests/libpspp/zip.at
+++ b/tests/libpspp/zip.at
@@ -1,3 +1,19 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017 Free Software Foundation, Inc.
+dnl 
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
 AT_BANNER([zip])
 
 AT_SETUP([Basic zip - unzip test])
@@ -14,20 +30,20 @@ mkdir -p $dir1
 names=""
 s=1;
 while test $s -le 8192 ; do
-       name=`mktemp -p $dir1`;
+       name=$dir1/$s
        dd if=/dev/urandom of=$name count=1 bs=$s 2> /dev/null
        s=$(($s * 2));
        bn=`basename $name`;
         names="$names $bn";
 done
 
-(cd $dir1 && $abs_top_builddir/tests/libpspp/zip-test w foo.zip $names)
+(cd $dir1 && zip-test w foo.zip $names)
 
 
 mkdir -p $dir2
 cp $dir1/foo.zip $dir2
 cd $dir2 
-$abs_top_builddir/tests/libpspp/zip-test r foo.zip $names
+zip-test r foo.zip $names
 
 # Compare the files to their originals
 for f in $names; do