Revert "golang: Don't run launch test if appliance has not been built."

This causes a strange error with modern golang:

  go: parsing $GOFLAGS: non-flag "appliance"

This reverts commit d57d8f22de.
This commit is contained in:
Richard W.M. Jones
2020-02-19 18:20:12 +00:00
parent 95244fd2ca
commit b68a67e1a9
2 changed files with 1 additions and 8 deletions

View File

@@ -37,11 +37,6 @@ EXTRA_DIST = \
if HAVE_GOLANG
GOFLAGS =
if ENABLE_APPLIANCE
GOFLAGS += -tags appliance
endif
golangpkgdir = $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/$(pkg)
golangsrcdir = $(GOROOT)/src/pkg/$(pkg)
@@ -53,7 +48,7 @@ pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go
golangsrc_DATA = $(source_files)
TESTS_ENVIRONMENT = pkg=$(pkg) GOFLAGS="$(GOFLAGS)" $(top_builddir)/run $(VG) # --test
TESTS_ENVIRONMENT = pkg=$(pkg) $(top_builddir)/run $(VG) # --test
TESTS = run-bindtests run-tests

View File

@@ -1,5 +1,3 @@
// +build appliance
/* libguestfs Go tests
* Copyright (C) 2013 Red Hat Inc.
*