summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonovan Baarda <abo@minkirri.apana.org.au>2021-08-20 17:23:58 +1000
committerDonovan Baarda <abo@minkirri.apana.org.au>2021-08-20 17:23:58 +1000
commit8731c4f6a08f3217808a230f63b27f63fe867fec (patch)
tree492ae15fe5381cf6d7d31ee0c75a1934d1bc6224
parent0b4c21dfdaebef39121dc1f1746885c6f946575d (diff)
downloadlibrsync-8731c4f6a08f3217808a230f63b27f63fe867fec.tar.gz
Rename test inputs from `*.in` to `*.input`.
Rename test input files, update test scripts, and update `.gitattributes` to treat `.input` files as binary, not `.in` files. This prevents cmake input templates ending in `.in` from being treated like binary test data files. In particular `doc/Doxyfile.in`.
-rw-r--r--.gitattributes2
-rw-r--r--tests/changes.input/01.input (renamed from tests/changes.input/01.in)0
-rw-r--r--tests/changes.input/02.input (renamed from tests/changes.input/02.in)0
-rw-r--r--tests/changes.input/03.input (renamed from tests/changes.input/03.in)0
-rw-r--r--tests/changes.input/04.input (renamed from tests/changes.input/04.in)0
-rw-r--r--tests/changes.input/05.input (renamed from tests/changes.input/05.in)bin7168 -> 7168 bytes
-rw-r--r--tests/changes.input/06.input (renamed from tests/changes.input/06.in)0
-rw-r--r--tests/changes.input/07.input (renamed from tests/changes.input/07.in)0
-rwxr-xr-xtests/changes.test14
-rw-r--r--tests/signature.input/01.input (renamed from tests/signature.input/01.in)0
-rwxr-xr-xtests/signature.test4
-rw-r--r--tests/triple.input/copying.input (renamed from tests/triple.input/copying.in)0
-rw-r--r--tests/triple.input/half.input (renamed from tests/triple.input/half.in)0
-rw-r--r--tests/triple.input/hello.input (renamed from tests/triple.input/hello.in)0
-rw-r--r--tests/triple.input/zero.input (renamed from tests/triple.input/zero.in)0
-rwxr-xr-xtests/triple.test4
16 files changed, 12 insertions, 12 deletions
diff --git a/.gitattributes b/.gitattributes
index 82f5712..e24e7bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
# Data files used for tests.
*.data binary
-*.in binary
+*.input binary
*.sig binary
*.delta binary
*.expect binary
diff --git a/tests/changes.input/01.in b/tests/changes.input/01.input
index e6e3285..e6e3285 100644
--- a/tests/changes.input/01.in
+++ b/tests/changes.input/01.input
diff --git a/tests/changes.input/02.in b/tests/changes.input/02.input
index 6028817..6028817 100644
--- a/tests/changes.input/02.in
+++ b/tests/changes.input/02.input
diff --git a/tests/changes.input/03.in b/tests/changes.input/03.input
index 281f004..281f004 100644
--- a/tests/changes.input/03.in
+++ b/tests/changes.input/03.input
diff --git a/tests/changes.input/04.in b/tests/changes.input/04.input
index 11264ae..11264ae 100644
--- a/tests/changes.input/04.in
+++ b/tests/changes.input/04.input
diff --git a/tests/changes.input/05.in b/tests/changes.input/05.input
index c6d6974..c6d6974 100644
--- a/tests/changes.input/05.in
+++ b/tests/changes.input/05.input
Binary files differ
diff --git a/tests/changes.input/06.in b/tests/changes.input/06.input
index e69de29..e69de29 100644
--- a/tests/changes.input/06.in
+++ b/tests/changes.input/06.input
diff --git a/tests/changes.input/07.in b/tests/changes.input/07.input
index ce01362..ce01362 100644
--- a/tests/changes.input/07.in
+++ b/tests/changes.input/07.input
diff --git a/tests/changes.test b/tests/changes.test
index 81acdfe..e9be0a0 100755
--- a/tests/changes.test
+++ b/tests/changes.test
@@ -1,21 +1,21 @@
#! /bin/sh -e
# librsync -- the library for network deltas
-#
+#
# Copyright (C) 2001, 2014 by Martin Pool <mbp@sourcefrog.net>
# changes.test: Test converting in both directions between each pair of files.
-
+
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public License
# as published by the Free Software Foundation; either version 2.1 of
# the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -28,13 +28,13 @@ inputdir=$srcdir/changes.input
for buf in $bufsizes
do
- old=$inputdir/01.in
- for new in $inputdir/*.in
+ old=$inputdir/01.input
+ for new in $inputdir/*.input
do
for hashopt in '' -Hmd4 -Hblake2
do
triple_test $buf $old $new $hashopt
- triple_test $buf $new $old $hashopt
+ triple_test $buf $new $old $hashopt
done
done
done
diff --git a/tests/signature.input/01.in b/tests/signature.input/01.input
index c4792dd..c4792dd 100644
--- a/tests/signature.input/01.in
+++ b/tests/signature.input/01.input
diff --git a/tests/signature.test b/tests/signature.test
index ae8c967..0a9c576 100755
--- a/tests/signature.test
+++ b/tests/signature.test
@@ -31,9 +31,9 @@ new=$tmpdir/signature
for rollfunc in rollsum rabinkarp; do
for hashfunc in md4 blake2; do
for stronglen in 0 -1 8; do
- for input in "$srcdir/signature.input"/*.in; do
+ for input in "$srcdir/signature.input"/*.input; do
for inbuf in $bufsizes; do
- expect=`echo $input | sed -e "s/.in\$/-R${rollfunc}-H${hashfunc}-S${stronglen}.sig/"`
+ expect=`echo $input | sed -e "s/.input\$/-R${rollfunc}-H${hashfunc}-S${stronglen}.sig/"`
run_test ${RDIFF} -R$rollfunc -H$hashfunc -S$stronglen -I$inbuf -f signature "$input" "$new"
check_compare "$expect" "$new"
done
diff --git a/tests/triple.input/copying.in b/tests/triple.input/copying.input
index c4792dd..c4792dd 100644
--- a/tests/triple.input/copying.in
+++ b/tests/triple.input/copying.input
diff --git a/tests/triple.input/half.in b/tests/triple.input/half.input
index 06ed63b..06ed63b 100644
--- a/tests/triple.input/half.in
+++ b/tests/triple.input/half.input
diff --git a/tests/triple.input/hello.in b/tests/triple.input/hello.input
index 10ddd6d..10ddd6d 100644
--- a/tests/triple.input/hello.in
+++ b/tests/triple.input/hello.input
diff --git a/tests/triple.input/zero.in b/tests/triple.input/zero.input
index e69de29..e69de29 100644
--- a/tests/triple.input/zero.in
+++ b/tests/triple.input/zero.input
diff --git a/tests/triple.test b/tests/triple.test
index f2f77aa..c2aa4e1 100755
--- a/tests/triple.test
+++ b/tests/triple.test
@@ -25,9 +25,9 @@ inputdir=$srcdir/triple.input
for buf in $bufsizes
do
- for old in $inputdir/*.in
+ for old in $inputdir/*.input
do
- for new in $inputdir/*.in
+ for new in $inputdir/*.input
do
for hashopt in -Hmd4 -Hblake2
do