This cherry-picked patch fixes tests for Go >= 1.15. Restic v0.10 (which
includes this patch) requires go module support from the Go build system.
Original patch follows.

---
From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sat, 12 Sep 2020 17:36:44 +0200
Subject: [PATCH] options: Fix test for Go >= 1.15

---
 internal/options/options_test.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/options/options_test.go b/internal/options/options_test.go
index de94fc90a1..8d268992a3 100644
--- a/internal/options/options_test.go
+++ b/internal/options/options_test.go
@@ -3,6 +3,7 @@ package options
 import (
 	"fmt"
 	"reflect"
+	"regexp"
 	"testing"
 	"time"
 )
@@ -199,7 +200,7 @@ var invalidSetTests = []struct {
 			"timeout": "2134",
 		},
 		"ns",
-		`time: missing unit in duration 2134`,
+		`time: missing unit in duration "?2134"?`,
 	},
 }
 
@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) {
 				t.Fatalf("expected error %v not found", test.err)
 			}
 
-			if err.Error() != test.err {
-				t.Fatalf("expected error %q, got %q", test.err, err.Error())
+			matched, err := regexp.MatchString(test.err, err.Error())
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if !matched {
+				t.Fatalf("expected error to match %q, got %q", test.err, err.Error())
 			}
 		})
 	}
h?id=5cdd45f0f155787b13eccc63c60f71ee123ff58b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-repl.sh'>
<input type='hidden' name='id' value='5cdd45f0f155787b13eccc63c60f71ee123ff58b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=5cdd45f0f155787b13eccc63c60f71ee123ff58b'>root</a>/<a href='/guix/log/tests?id=5cdd45f0f155787b13eccc63c60f71ee123ff58b'>tests</a>/<a href='/guix/log/tests/guix-repl.sh?id=5cdd45f0f155787b13eccc63c60f71ee123ff58b'>guix-repl.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-repl.sh?id=5cdd45f0f155787b13eccc63c60f71ee123ff58b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-16 16:04:01 +0200'>2020-09-16</span></td><td><a href='/guix/commit/tests/guix-repl.sh?id=d7f7ed39be3be926b3c46c0ea15d416c593ef61f'>repl: Look for script files in (getcwd).</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/43331&gt;.

* guix/scripts/repl.scm (guix-repl): Replace "." by (getcwd)
* tests/guix-repl.sh: Add test.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Konrad Hinsen</td></tr>
<tr><td><span title='2020-06-14 23:02:36 +0200'>2020-06-14</span></td><td><a href='/guix/commit/tests/guix-repl.sh?id=c924e541390f9595d819edc33c19d979917c15ec'>guix repl: Add script execution.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/repl.scm: Add filename options for script execution.
* doc/guix.texi (Invoking guix repl): Document it.
* tests/guix-repl.sh: Test it.
* Makefile.am: (SH_TESTS): Add it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Konrad Hinsen</td></tr>