From 350aa528015ff11d78a9aea87b85a9aaed855717 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 5 Nov 2014 04:04:24 +0000 Subject: [PATCH] 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 --- gcc/testsuite/go.test/go-test.exp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp index fd837227d07..71272a3aa90 100644 --- a/gcc/testsuite/go.test/go-test.exp +++ b/gcc/testsuite/go.test/go-test.exp @@ -449,13 +449,22 @@ proc go-gc-tests { } { } if { [ string match "// +build *" $test_line ] } { - if { [ string match "*[getenv GOARCH]*" $test_line ] } { - continue - } - if { [ string match "*linux*" $test_line ] } { - continue + set matches_pos 0 + set matches_neg 0 + if { [ regexp -line "\[ \][getenv GOARCH]\(\[ \]\|\$\)" $test_line ] } { + set matches_pos 1 + } 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 } close $fd -- 2.30.2