From 350e853bc999ed32f877a99d892144bfbc60d60c Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Sun, 20 Oct 2024 22:40:52 +0200 Subject: prog: let explicitly check whether git revision is known There was a bug in syz-manager because of that. Fix it by introducing a new method in prog. --- prog/meta.go | 14 ++++++++++---- syz-manager/manager.go | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/prog/meta.go b/prog/meta.go index 61e0c7edb..5c23627df 100644 --- a/prog/meta.go +++ b/prog/meta.go @@ -8,13 +8,19 @@ import ( "time" ) +const defaultGitRevision = "unknown" + var ( - GitRevision = "unknown" // emitted by Makefile, may contain + at the end - GitRevisionBase string // without + - gitRevisionDate string // emitted by Makefile - GitRevisionDate time.Time // parsed from gitRevisionDate + GitRevision = defaultGitRevision // emitted by Makefile, may contain + at the end + GitRevisionBase string // without + + gitRevisionDate string // emitted by Makefile + GitRevisionDate time.Time // parsed from gitRevisionDate ) +func GitRevisionKnown() bool { + return GitRevision != defaultGitRevision +} + func init() { GitRevisionBase = strings.Replace(GitRevision, "+", "", -1) if gitRevisionDate != "" { diff --git a/syz-manager/manager.go b/syz-manager/manager.go index b5c879cad..66713e43b 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -151,7 +151,7 @@ const ( ) func main() { - if prog.GitRevision == "" { + if !prog.GitRevisionKnown() { log.Fatalf("bad syz-manager build: build with make, run bin/syz-manager") } flag.Parse() -- cgit mrf-deployment