diff --git a/scripts/base/misc/version.bro b/scripts/base/misc/version.bro index 4fe37d200c..259b7b1127 100644 --- a/scripts/base/misc/version.bro +++ b/scripts/base/misc/version.bro @@ -49,7 +49,7 @@ export { function parse(version_string: string): VersionDescription { - if ( /[[:digit:]]\.[[:digit:]][[:digit:]]?(\.[[:digit:]][[:digit:]]?)?(\-beta)?(-[[:digit:]]+)?(\-debug)?/ != version_string ) + if ( /[[:digit:]]\.[[:digit:]][[:digit:]]?(\.[[:digit:]][[:digit:]]?)?(\-beta[[:digit:]]?)?(-[[:digit:]]+)?(\-debug)?/ != version_string ) { Reporter::error(fmt("Version string %s cannot be parsed", version_string)); return VersionDescription($version_number=0, $major=0, $minor=0, $patch=0, $commit=0, $beta=F, $debug=F, $version_string=version_string); diff --git a/testing/btest/Baseline/scripts.base.misc.version/.stdout b/testing/btest/Baseline/scripts.base.misc.version/.stdout index 5b207674f3..359bde8473 100644 --- a/testing/btest/Baseline/scripts.base.misc.version/.stdout +++ b/testing/btest/Baseline/scripts.base.misc.version/.stdout @@ -5,6 +5,7 @@ [version_number=20500, major=2, minor=5, patch=0, commit=12, beta=T, debug=F, version_string=2.5-beta-12] [version_number=20500, major=2, minor=5, patch=0, commit=0, beta=F, debug=T, version_string=2.5-12-debug] [version_number=20502, major=2, minor=5, patch=2, commit=12, beta=T, debug=T, version_string=2.5.2-beta-12-debug] +[version_number=20502, major=2, minor=5, patch=2, commit=12, beta=T, debug=T, version_string=2.5.2-beta5-12-debug] [version_number=11220, major=1, minor=12, patch=20, commit=2562, beta=T, debug=T, version_string=1.12.20-beta-2562-debug] [version_number=0, major=0, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=1] [version_number=0, major=0, minor=0, patch=0, commit=0, beta=F, debug=F, version_string=12.5] diff --git a/testing/btest/scripts/base/misc/version.bro b/testing/btest/scripts/base/misc/version.bro index bb7879509d..cd19f0ee30 100644 --- a/testing/btest/scripts/base/misc/version.bro +++ b/testing/btest/scripts/base/misc/version.bro @@ -10,6 +10,7 @@ print Version::parse("2.5.1-debug"); print Version::parse("2.5-beta-12"); print Version::parse("2.5-12-debug"); print Version::parse("2.5.2-beta-12-debug"); +print Version::parse("2.5.2-beta5-12-debug"); print Version::parse("1.12.20-beta-2562-debug"); # bad versions