chore: update files after the rename

Dockerfile

@@ -6,6 +6,6 @@ COPY ./go.mod ./go.sum ./
 RUN go mod download
 
 COPY . .
-RUN go build -o ./gateway-conformance ./entrypoint.go
+RUN go build -o ./gateway-conformance ./cmd/gateway-conformance
 
 ENTRYPOINT ["/app/gateway-conformance"]

Makefile

@@ -11,15 +11,12 @@ provision-kubo:
 test-kubo: provision-kubo
 	GATEWAY_URL=http://127.0.0.1:8080 make _test
 
-merge-fixtures:
-	go build -o merge-fixtures ./tooling/cmd/merge_fixtures.go
-
 # tools
 fixtures.car: gateway-conformance
 	./gateway-conformance extract-fixtures --merged=true --dir=.
 
 gateway-conformance:
-	go build -o ./gateway-conformance ./entrypoint.go
+	go build -o ./gateway-conformance ./cmd/gateway-conformance
 
 _test: fixtures.car gateway-conformance
 	./gateway-conformance test --json output.json --gateway-url ${GATEWAY_URL}

cmd/gateway-conformance/main.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/ipfs/gateway-conformance/tooling"
-	"github.com/ipfs/gateway-conformance/tooling/cmd"
+	"github.com/ipfs/gateway-conformance/tooling/car"
 	"github.com/ipfs/gateway-conformance/tooling/fixtures"
 	"github.com/urfave/cli/v2"
 )
@@ -171,7 +171,7 @@ func main() {
 
 					merged := cCtx.Bool("merged")
 					if merged {
-						err = cmd.Merge(filepath.Join(directory, "fixtures.car"))
+						err = car.Merge(files, filepath.Join(directory, "fixtures.car"))
 						if err != nil {
 							return err
 						}

tooling/car/merge.go

@@ -1,20 +1,14 @@
-package cmd
+package car
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/ipfs/gateway-conformance/tooling/fixtures"
 	"github.com/ipfs/go-cid"
 	"github.com/ipld/go-car/v2/blockstore"
 )
 
-func Merge(outputPath string) error {
-	inputPaths, err := fixtures.List()
-	if err != nil {
-		return err
-	}
-
+func Merge(inputPaths []string, outputPath string) error {
 	// First list all the roots in our fixtures
 	roots := make([]cid.Cid, 0)