From a5d1ee156b76c4f823ae2554a0fd2e2ab9aaccaa Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyphar@cyphar.com>
Date: Thu, 8 Apr 2021 18:55:40 +1000
Subject: [PATCH] makefile: fix bad build flags

Fix mistake in the Makefile which prevents the version field (as well as
some other build flags) from being passed to "go build". Update the
"runc --version" integration test to make sure that the contents of
VERSION are actually present.

Fixes: 6fbd32e48b66 ("Make Makefile more portable")
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
 Makefile       | 2 +-
 test/help.bats | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d760e928..1fdcf650 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ BASE_LDFLAGS := -s -w -X ${PROJECT}.gitCommit=${COMMIT} -X ${PROJECT}.version=${
 
 # Specific build flags for build type.
 ifeq ($(GOOS), linux)
-	TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test"		   DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}"
+	DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}"
 	TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test"
 else
 	DYN_BUILD_FLAGS := ${BASE_FLAGS} -ldflags "${BASE_LDFLAGS}"
diff --git a/test/help.bats b/test/help.bats
index 3d6dc975..a3826435 100644
--- a/test/help.bats
+++ b/test/help.bats
@@ -17,13 +17,15 @@
 load helpers
 
 @test "umoci --version" {
+	VERSION="$(cat "$INTEGRATION_ROOT/../VERSION")"
+
 	umoci --version
 	[ "$status" -eq 0 ]
-	[[ "$output" =~ "umoci version "+ ]]
+	[[ "$output" =~ "umoci version $VERSION"+ ]]
 
 	umoci -v
 	[ "$status" -eq 0 ]
-	[[ "$output" =~ "umoci version "+ ]]
+	[[ "$output" =~ "umoci version $VERSION"+ ]]
 }
 
 @test "umoci --help" {