doc/progs: use test/run.go for testing on Windows

cgo[1-4].go, go1.go couldn't be tested now
(cgo[1-4].go can only be tested when cgo is enabled, go1.go
contain a list of filenames in the current directory)

R=golang-dev, alex.brainman, rsc
CC=golang-dev
https://golang.org/cl/6218048

doc/Makefile

@@ -25,3 +25,8 @@ all: $(RAWHTML)
 
 clean:
 	rm -f $(RAWHTML)
+
+compare:
+	for i in $(RAWHTML); do \
+		godoc -url /doc/$${i/.rawhtml/.html} | diff -u $$i -; \
+	done

doc/effective_go.html

@@ -2973,7 +2973,7 @@ for instance, a URL, saving you typing the URL into the phone's tiny keyboard.
 Here's the complete program.
 An explanation follows.
 </p>
-{{code "/doc/progs/eff_qr.go"}}
+{{code "/doc/progs/eff_qr.go" `/package/` `$`}}
 <p>
 The pieces up to <code>main</code> should be easy to follow.
 The one flag sets a default HTTP port for our server.  The template

doc/progs/cgo1.go

@@ -1,3 +1,5 @@
+// skip
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/cgo2.go

@@ -1,3 +1,5 @@
+// skip
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/cgo3.go

@@ -1,3 +1,5 @@
+// skip
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/cgo4.go

@@ -1,3 +1,5 @@
+// skip
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/defer.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/defer.out

@@ -0,0 +1,3 @@
+0
+3210
+2

doc/progs/defer2.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/defer2.out

@@ -0,0 +1,12 @@
+Calling g.
+Printing in g 0
+Printing in g 1
+Printing in g 2
+Printing in g 3
+Panicking!
+Defer in g 3
+Defer in g 2
+Defer in g 1
+Defer in g 0
+Recovered in f 4
+Returned normally from f.

doc/progs/eff_bytesize.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/eff_bytesize.out

@@ -0,0 +1 @@
+1.00YB 9.09TB

doc/progs/eff_qr.go

@@ -1,3 +1,9 @@
+// compile
+
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package main
 
 import (

doc/progs/eff_sequence.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/eff_sequence.out

@@ -0,0 +1 @@
+[-1 2 6 16 44]

doc/progs/error.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/error2.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/error3.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/error4.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/go1.go

@@ -1,3 +1,6 @@
+// compile
+// this file will output a list of filenames in cwd, not suitable for cmpout
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/gobs1.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/gobs2.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_draw.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package1.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package1.out

@@ -0,0 +1 @@
+X is 2 Y is 1

doc/progs/image_package2.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package2.out

@@ -0,0 +1 @@
+3 4 false

doc/progs/image_package3.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package3.out

@@ -0,0 +1 @@
+3 4 true

doc/progs/image_package4.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package4.out

@@ -0,0 +1 @@
+image.Point{X:2, Y:1}

doc/progs/image_package5.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package5.out

@@ -0,0 +1 @@
+{255 0 0 255}

doc/progs/image_package6.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/image_package6.out

@@ -0,0 +1,2 @@
+8 4
+true

doc/progs/interface.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/interface2.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/interface2.out

@@ -0,0 +1 @@
+type: float64

doc/progs/json1.go

@@ -1,3 +1,5 @@
+// run
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/json2.go

@@ -1,3 +1,5 @@
+// cmpout
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/json2.out

@@ -0,0 +1,2 @@
+the circle's area 24.227111172875365
+the reciprocal of i is 0.3601008282319049

doc/progs/json3.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/json4.go

@@ -1,3 +1,5 @@
+// run
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/json5.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/slices.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/timeout1.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/timeout2.go

@@ -1,3 +1,5 @@
+// compile
+
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.

doc/progs/update.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2012 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+set -e
+
+rm -f *.out *.rej *.orig [568].out
+
+for i in *.go; do
+	if grep -q '^// cmpout$' $i; then
+		echo $i
+		go run $i &> ${i/.go/.out}
+	fi
+done

src/run.bat

@@ -70,7 +70,10 @@ go run %GOROOT%\test\run.go - ..\misc\cgo\life
 if errorlevel 1 goto fail
 echo.
 
-:: TODO ..\misc\cgo\stdio
+echo # ..\misc\cgo\stdio
+go run %GOROOT%\test\run.go - ..\misc\cgo\stdio
+if errorlevel 1 goto fail
+echo.
 
 :: TODO(brainman): disabled, because it fails with: mkdir C:\Users\ADMINI~1\AppData\Local\Temp\2.....\go\misc\cgo\: The filename or extension is too long.
 ::echo # ..\misc\cgo\test
@@ -79,6 +82,11 @@ echo.
 ::echo.
 :nocgo
 
+echo # ..\doc\progs
+go run %GOROOT%\test\run.go - ..\doc\progs
+if errorlevel 1 goto fail
+echo.
+
 :: TODO: The other tests in run.bash.
 
 echo # test