unicode/norm: fix disabled test

Test is now run as part of go generate. The data_test.go file that is generated is very large (350K) and is really only needed when one is generating anyway. Change-Id: I9ff407b802a51d2638716adf11bc73554628c077 Reviewed-on: https://go-review.googlesource.com/38193 Run-TryBot: Marcel van Lohuizen <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]> Reviewed-by: Nigel Tao <[email protected]>
golang · Mar 22, 2017 · d6659f7 · d6659f7
1 parent f28f367
commit d6659f7
Show file tree

Hide file tree

Showing 5 changed files with 522 additions and 516 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 # Add no patterns to .gitignore except for files generated by the build.
 last-change
 /DATA
+# This file is rather large and the tests really only need to be run
+# after generation.
+/unicode/norm/data_test.go
diff --git a/unicode/norm/forminfo.go b/unicode/norm/forminfo.go
@@ -10,7 +10,7 @@ package norm
 // and its corresponding decomposing form share the same trie.  Each trie maps
 // a rune to a uint16. The values take two forms.  For v >= 0x8000:
 //   bits
-//   15:    1 (inverse of NFD_QD bit of qcInfo)
+//   15:    1 (inverse of NFD_QC bit of qcInfo)
 //   13..7: qcInfo (see below). isYesD is always true (no decompostion).
 //    6..0: ccc (compressed CCC value).
 // For v < 0x8000, the respective rune has a decomposition and v is an index

diff --git a/unicode/norm/maketables.go b/unicode/norm/maketables.go
@@ -35,12 +35,9 @@ func main() {
 	computeNonStarterCounts()
 	verifyComputed()
 	printChars()
-	if *test {
-		testDerived()
-		printTestdata()
-	} else {
-		makeTables()
-	}
+	testDerived()
+	printTestdata()
+	makeTables()
 }
 
 var (
@@ -602,6 +599,7 @@ func printCharInfoTables(w io.Writer) int {
 		}
 		index := normalDecomp
 		nTrail := chars[r].nTrailingNonStarters
+		nLead := chars[r].nLeadingNonStarters
 		if tccc > 0 || lccc > 0 || nTrail > 0 {
 			tccc <<= 2
 			tccc |= nTrail
@@ -612,7 +610,7 @@ func printCharInfoTables(w io.Writer) int {
 					index = firstCCC
 				}
 			}
-			if lccc > 0 {
+			if lccc > 0 || nLead > 0 {
 				s += string([]byte{lccc})
 				if index == firstCCC {
 					log.Fatalf("%U: multi-segment decomposition not supported for decompositions with leading CCC != 0", r)

diff --git a/unicode/norm/normalize.go b/unicode/norm/normalize.go
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Note: the file data_test.go that is generated should not be checked in.
 //go:generate go run maketables.go triegen.go
-//go:generate go run maketables.go triegen.go -test
+//go:generate go test -tags test
 
 // Package norm contains types and functions for normalizing Unicode strings.
 package norm // import "golang.org/x/text/unicode/norm"