Skip to content

Commit

Permalink
Revert "golang: Don't run launch test if appliance has not been built."
Browse files Browse the repository at this point in the history
This causes a strange error with modern golang:

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

This reverts commit d57d8f2.
  • Loading branch information
rwmjones committed Feb 19, 2020
1 parent 95244fd commit b68a67e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
7 changes: 1 addition & 6 deletions golang/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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

Expand Down
2 changes: 0 additions & 2 deletions golang/src/libguestfs.org/guestfs/guestfs_100_launch_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build appliance

/* libguestfs Go tests
* Copyright (C) 2013 Red Hat Inc.
*
Expand Down

0 comments on commit b68a67e

Please sign in to comment.