Fix some tests.

[lightning.git] / export.go

diff --git a/export.go b/export.go
index b6b6263117c0db461ec424521341ce2e0177210d..39af631e9a4e0b552f2e507f7c0fe37ffb17bed4 100644 (file)
--- a/export.go
+++ b/export.go
@@ -97,9 +97,8 @@ func (cmd *exporter) RunCommand(prog string, args []string, stdin io.Reader, std
                return 0
        } else if err != nil {
                return 2
-       }
-       if flag.NArg() > 0 {
-               err = fmt.Errorf("extra unparsed command line arguments: %q", flag.Args())
+       } else if flags.NArg() > 0 {
+               err = fmt.Errorf("errant command line arguments after parsed flags: %v", flags.Args())
                return 2
        }
 
@@ -133,7 +132,7 @@ func (cmd *exporter) RunCommand(prog string, args []string, stdin io.Reader, std
                        Priority:    *priority,
                        APIAccess:   true,
                }
-               err = runner.TranslatePaths(inputDir)
+               err = runner.TranslatePaths(inputDir, cases)
                if err != nil {
                        return 1
                }
@@ -175,7 +174,7 @@ func (cmd *exporter) RunCommand(prog string, args []string, stdin io.Reader, std
                retainTileSequences: true,
                compactGenomes:      map[string][]tileVariantID{},
        }
-       err = tilelib.LoadDir(context.Background(), *inputDir, nil)
+       err = tilelib.LoadDir(context.Background(), *inputDir)
        if err != nil {
                return 1
        }
@@ -223,11 +222,14 @@ func (cmd *exporter) RunCommand(prog string, args []string, stdin io.Reader, std
        cmd.cases = make([]bool, len(names))
        if *cases != "" {
                log.Infof("reading cases file: %s", *cases)
-               f, err := open(*cases)
+               var f io.ReadCloser
+               f, err = open(*cases)
                if err != nil {
                        return 1
                }
-               buf, err := io.ReadAll(f)
+               defer f.Close()
+               var buf []byte
+               buf, err = io.ReadAll(f)
                if err != nil {
                        return 1
                }