go/printer: fix test for new import path restrictions

Import paths with spaces are now invalid.

The builders would've caught this if they were running
the long tests.  I've removed the check for short tests
in this package since the current tests are fast enough
already.

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/5694082

diff --git a/src/pkg/go/printer/printer_test.go b/src/pkg/go/printer/printer_test.go
index 2d4f61356c19f6d67f3d0ad6b7a3dcdc40129886..497d671f240bd06fe71c0ddc7fa6288d47087cc0 100644 (file)
--- a/src/pkg/go/printer/printer_test.go
+++ b/src/pkg/go/printer/printer_test.go
@@ -154,15 +154,12 @@ var data = []entry{
 }
 
 func TestFiles(t *testing.T) {
-       for i, e := range data {
+       for _, e := range data {
                source := filepath.Join(dataDir, e.source)
                golden := filepath.Join(dataDir, e.golden)
                check(t, source, golden, e.mode)
                // TODO(gri) check that golden is idempotent
                //check(t, golden, golden, e.mode)
-               if testing.Short() && i >= 3 {
-                       break
-               }
        }
 }
 

diff --git a/src/pkg/go/printer/testdata/declarations.golden b/src/pkg/go/printer/testdata/declarations.golden
index 928b8ce0a9f826b1f9bf92b72493cbd82c7c19c0..a46463e56e6609476710cce8fa83b00b97351d5e 100644 (file)
--- a/src/pkg/go/printer/testdata/declarations.golden
+++ b/src/pkg/go/printer/testdata/declarations.golden
@@ -83,13 +83,13 @@ import (
 // more import examples
 import (
        "xxx"
-       "much longer name"      // comment
-       "short name"            // comment
+       "much_longer_name"      // comment
+       "short_name"            // comment
 )
 
 import (
        _ "xxx"
-       "much longer name"      // comment
+       "much_longer_name"      // comment
 )
 
 import (

diff --git a/src/pkg/go/printer/testdata/declarations.input b/src/pkg/go/printer/testdata/declarations.input
index 68f90308a362b942fb55a72ffe682346d5caeddf..df8c2b167e16bcb719196f47d462184ee74e4337 100644 (file)
--- a/src/pkg/go/printer/testdata/declarations.input
+++ b/src/pkg/go/printer/testdata/declarations.input
@@ -84,13 +84,13 @@ import (
 // more import examples
 import (
        "xxx"
-       "much longer name" // comment
-       "short name" // comment
+       "much_longer_name" // comment
+       "short_name" // comment
 )
 
 import (
        _ "xxx"
-       "much longer name" // comment
+       "much_longer_name" // comment
 )
 
 import (