testscript: Fail testscript if txtar contains duplicate filenames

rogpeppe · Sep 27, 2022 · 7370561 · 7370561
1 parent 7a6a5f8
commit 7370561
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/testscript/testdata/testscript_duplicate_file.txt b/testscript/testdata/testscript_duplicate_file.txt
@@ -0,0 +1,16 @@
+# Check that duplicate filenames are detected.
+unquote scripts-simple/testscript.txt
+unquote scripts-normalized/testscript.txt
+
+! testscript scripts-simple
+stdout 'duplicate filename'
+
+! testscript scripts-normalized
+stdout 'duplicate filename'
+
+-- scripts-simple/testscript.txt --
+>-- file --
+>-- file --
+-- scripts-normalized/testscript.txt --
+>-- file --
+>-- dir/../file --
diff --git a/testscript/testscript.go b/testscript/testscript.go
@@ -364,6 +364,9 @@ func (ts *TestScript) setup() string {
 	ts.archive = a
 	for _, f := range a.Files {
 		name := ts.MkAbs(ts.expand(f.Name))
+		if _, exists := ts.scriptFiles[name]; exists {
+			ts.Fatalf("%s: duplicate filename", f.Name)
+		}
 		ts.scriptFiles[name] = f.Name
 		ts.Check(os.MkdirAll(filepath.Dir(name), 0o777))
 		ts.Check(ioutil.WriteFile(name, f.Data, 0o666))