summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Holzinger <paul.holzinger@web.de>2020-08-18 19:37:05 +0200
committerPaul Holzinger <paul.holzinger@web.de>2020-08-18 20:37:18 +0200
commitd9f0c48176cb5049605ae0e3aad4173685d9c6ea (patch)
tree40069b4ed7afda21ba099008498aa69de23090a2
parent748e8829da76394ec956ea6590599fab01b467b7 (diff)
downloadpodman-d9f0c48176cb5049605ae0e3aad4173685d9c6ea.tar.gz
podman-d9f0c48176cb5049605ae0e3aad4173685d9c6ea.tar.bz2
podman-d9f0c48176cb5049605ae0e3aad4173685d9c6ea.zip
fix podman version output to include git commit and builttime
Add the go module version v2 to the libpod path. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
-rw-r--r--Makefile2
-rw-r--r--test/system/001-basic.bats7
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4c9440fc5..8ce1946ee 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ else
BUILD_INFO ?= $(shell date "+$(DATE_FMT)")
ISODATE ?= $(shell date --iso-8601)
endif
-LIBPOD := ${PROJECT}/libpod
+LIBPOD := ${PROJECT}/v2/libpod
GCFLAGS ?= all=-trimpath=${PWD}
ASMFLAGS ?= all=-trimpath=${PWD}
LDFLAGS_PODMAN ?= \
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index b23107e79..a5a3324fb 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -24,6 +24,13 @@ function setup() {
is "${lines[0]}" "Version:[ ]\+[1-9][0-9.]\+" "Version line 1"
is "$output" ".*Go Version: \+" "'Go Version' in output"
is "$output" ".*API Version: \+" "API version in output"
+
+ # Test that build date is reasonable, e.g. after 2019-01-01
+ local built=$(expr "$output" : ".*Built: \+\(.*\)" | head -n1)
+ local built_t=$(date --date="$built" +%s)
+ if [ $built_t -lt 1546300800 ]; then
+ die "Preposterous 'Built' time in podman version: '$built'"
+ fi
}