Simplify test code by using GNU sed -i emulator script

4 files changed, 5 insertions, 28 deletions

diff --git a/tests/convert5to6.script b/tests/convert5to6.script
index aeacf2b1..92627d34 100755
--- a/tests/convert5to6.script
+++ b/tests/convert5to6.script
@@ -19,12 +19,6 @@
 
 set -eu
 
-# GNU sed is required:
-if [ -e /usr/local/bin/gsed ]; then
-    SED=/usr/local/bin/gsed; else
-    SED=sed
-fi
-
 cd "$DATADIR"
 tar -xf "$SRCDIR/test-data/repo-format-5-encrypted-gzipped.tar.gz"
 "$SRCDIR/tests/obnam" convert5to6 \
@@ -38,7 +32,8 @@ tar -xf "$SRCDIR/test-data/repo-format-5-encrypted-gzipped.tar.gz"
 # Not all filesystems support nanosecond timestamps, but that doesn't
 # matter for us. So we remove the sub-second timestamps from both
 # summain files.
-$SED -i '/^Mtime:/s/\.[0-9]* /.IGNORED /' data.summain restored.summain
+"$SRCDIR/sed-in-place" '/^Mtime:/s/\.[0-9]* /.IGNORED /' \
+    data.summain restored.summain
 
 diff -u data.summain restored.summain
 
diff --git a/tests/forget-removes-according-to-policy.script b/tests/forget-removes-according-to-policy.script
index 25a603f1..ab702cb3 100755
--- a/tests/forget-removes-according-to-policy.script
+++ b/tests/forget-removes-according-to-policy.script
@@ -19,18 +19,12 @@ set -e
 echo aaa > "$DATADIR/data/aaa"
 echo ccc > "$DATADIR/data/ccc"
 
-# GNU sed is required:
-if [ -e /usr/local/bin/gsed ]; then
-    SED=/usr/local/bin/gsed; else
-    SED=sed
-fi
-
 $SRCDIR/tests/backup
 $SRCDIR/tests/backup
 
 $SRCDIR/tests/obnam genids > "$DATADIR/genids-1"
 $SRCDIR/tests/obnam forget --keep=1d
-$SED -i 1d "$DATADIR/genids-1"
+$SRCDIR/sed-in-place 1d "$DATADIR/genids-1"
 $SRCDIR/tests/obnam genids > "$DATADIR/genids-2"
 diff -u "$DATADIR/genids-1" "$DATADIR/genids-2"
 
diff --git a/tests/forget-removes-specified-gens.script b/tests/forget-removes-specified-gens.script
index e0de9d47..424ce284 100755
--- a/tests/forget-removes-specified-gens.script
+++ b/tests/forget-removes-specified-gens.script
@@ -16,12 +16,6 @@
 
 set -e
 
-# GNU sed is required:
-if [ -e /usr/local/bin/gsed ]; then
-    SED=/usr/local/bin/gsed; else
-    SED=sed
-fi
-
 echo aaa > "$DATADIR/data/aaa"
 echo ccc > "$DATADIR/data/ccc"
 
@@ -30,7 +24,7 @@ $SRCDIR/tests/backup
 
 $SRCDIR/tests/obnam genids > "$DATADIR/genids-1"
 $SRCDIR/tests/obnam forget $(head -n1 "$DATADIR/genids-1")
-$SED -i 1d "$DATADIR/genids-1"
+$SRCDIR/sed-in-place 1d "$DATADIR/genids-1"
 $SRCDIR/tests/obnam genids > "$DATADIR/genids-2"
 diff -u "$DATADIR/genids-1" "$DATADIR/genids-2"
 
diff --git a/tests/verify b/tests/verify
index bfac1c6e..a4bfe602 100755
--- a/tests/verify
+++ b/tests/verify
@@ -18,12 +18,6 @@
 
 set -e
 
-# GNU sed is required:
-if [ -e /usr/local/bin/gsed ]; then
-    SED=/usr/local/bin/gsed; else
-    SED=sed
-fi
-
 summain -r "$DATADIR/data" > "$DATADIR/data.summain"
 summain -r "$DATADIR/restored/$DATADIR/data" > "$DATADIR/restored.summain"
 
@@ -31,7 +25,7 @@ summain -r "$DATADIR/restored/$DATADIR/data" > "$DATADIR/restored.summain"
 # summain output to remove sub-second timestamps.
 if [ "$OBNAM_TEST_SFTP_ROOT" = yes ]
 then
-    $SED -i '/^Mtime:/s/\.[[:digit:]]\+ / /' \
+    "$SRCDIR/sed-in-place" '/^Mtime:/s/\.[[:digit:]]\+ / /' \
         "$DATADIR/data.summain" \
         "$DATADIR/restored.summain"
 fi