Commit 350aa528 by Ian Lance Taylor

go-test.exp: In +build lines, require whitespace around expected strings, fix check for negation.

	* go.test/go-test.exp: In +build lines, require whitespace around
	expected strings, fix check for negation.

From-SVN: r217111
parent c9bc4e2d
...@@ -449,13 +449,22 @@ proc go-gc-tests { } { ...@@ -449,13 +449,22 @@ proc go-gc-tests { } {
} }
if { [ string match "// +build *" $test_line ] } { if { [ string match "// +build *" $test_line ] } {
if { [ string match "*[getenv GOARCH]*" $test_line ] } { set matches_pos 0
continue set matches_neg 0
} if { [ regexp -line "\[ \][getenv GOARCH]\(\[ \]\|\$\)" $test_line ] } {
if { [ string match "*linux*" $test_line ] } { set matches_pos 1
continue } elseif { [ regexp -line "\[ \]\![getenv GOARCH]\(\[ \]\|\$\)" $test_line ] } {
set matches_neg 1
} elseif { [ regexp -line "\[ \]linux\(\[ \]\|\$\)" $test_line ] } {
set matches_pos 1
} elseif { [ regexp -line "\[ \]\!linux\(\[ \]\|\$\)" $test_line ] } {
set matches_neg 1
} elseif { [ regexp -line "\[ \]\!windows\(\[ \]\|\$\)" $test_line ] } {
set matches_pos 1
} elseif { [ regexp -line "\[ \]windows\(\[ \]\|\$\)" $test_line ] } {
set matches_neg 1
} }
if { [ string match "*!windows*" $test_line ] } { if { $matches_pos == 1 && $matches_neg == 0 } {
continue continue
} }
close $fd close $fd
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment