diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2024-10-20 22:40:52 +0200 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2024-10-25 12:08:02 +0000 |
| commit | 350e853bc999ed32f877a99d892144bfbc60d60c (patch) | |
| tree | b7bbad1377ce39a4752f962d818e07b490f88dc4 | |
| parent | c0aa87d6da9bb0a5b04e70e4d2bb3cd187c566b6 (diff) | |
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.
| -rw-r--r-- | prog/meta.go | 14 | ||||
| -rw-r--r-- | 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() |
