]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile: correct check for valid -lang version
authorIan Lance Taylor <iant@golang.org>
Mon, 12 Nov 2018 18:38:02 +0000 (10:38 -0800)
committerIan Lance Taylor <iant@golang.org>
Tue, 13 Nov 2018 00:08:32 +0000 (00:08 +0000)
Change-Id: Iad10d0a2dbc8e12e9f776c6cfb34070f584fd439
Reviewed-on: https://go-review.googlesource.com/c/149057
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>
src/cmd/compile/internal/gc/lang_test.go
src/cmd/compile/internal/gc/main.go

index b225f03a1de1f233d222fb5acc375977057d5d82..72e7f07a21c0028ce8a6352cc63ae2a2584d08a5 100644 (file)
@@ -41,6 +41,11 @@ func TestInvalidLang(t *testing.T) {
                t.Error("compilation with -lang=go9.99 succeeded unexpectedly")
        }
 
+       // This test will have to be adjusted if we ever reach 1.99 or 2.0.
+       if testLang(t, "go1.99", src, outfile) == nil {
+               t.Error("compilation with -lang=go1.99 succeeded unexpectedly")
+       }
+
        if testLang(t, "go1.8", src, outfile) == nil {
                t.Error("compilation with -lang=go1.8 succeeded unexpectedly")
        }
index e5d42bfd7da1549dd2c3c1983c67875da344bc87..44c540492b0927c5c0162f629abd82f256415145 100644 (file)
@@ -1444,7 +1444,7 @@ func checkLang() {
                if err != nil {
                        log.Fatalf("internal error parsing default lang %q: %v", def, err)
                }
-               if langWant.major > defVers.major || (langWant.major == defVers.major && langWant.major > defVers.minor) {
+               if langWant.major > defVers.major || (langWant.major == defVers.major && langWant.minor > defVers.minor) {
                        log.Fatalf("invalid value %q for -lang: max known version is %q", flag_lang, def)
                }
        }