From f5f3c3fe093fc359045a3818d3cd04f7b40b06c2 Mon Sep 17 00:00:00 2001
From: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
Date: Sun, 24 Jun 2012 19:22:48 -0400
Subject: [PATCH] exp/inotify: prevent data race during testing Fixes #3714.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6341047
---
 src/pkg/exp/inotify/inotify_linux_test.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pkg/exp/inotify/inotify_linux_test.go b/src/pkg/exp/inotify/inotify_linux_test.go
index d41d66bfac..1685b772ec 100644
--- a/src/pkg/exp/inotify/inotify_linux_test.go
+++ b/src/pkg/exp/inotify/inotify_linux_test.go
@@ -9,6 +9,7 @@ package inotify
 import (
 	"io/ioutil"
 	"os"
+	"sync/atomic"
 	"testing"
 	"time"
 )
@@ -43,13 +44,13 @@ func TestInotifyEvents(t *testing.T) {
 
 	// Receive events on the event channel on a separate goroutine
 	eventstream := watcher.Event
-	var eventsReceived = 0
+	var eventsReceived int32 = 0
 	done := make(chan bool)
 	go func() {
 		for event := range eventstream {
 			// Only count relevant events
 			if event.Name == testFile {
-				eventsReceived++
+				atomic.AddInt32(&eventsReceived, 1)
 				t.Logf("event received: %s", event)
 			} else {
 				t.Logf("unexpected event received: %s", event)
@@ -67,7 +68,7 @@ func TestInotifyEvents(t *testing.T) {
 
 	// We expect this event to be received almost immediately, but let's wait 1 s to be sure
 	time.Sleep(1 * time.Second)
-	if eventsReceived == 0 {
+	if atomic.AddInt32(&eventsReceived, 0) == 0 {
 		t.Fatal("inotify event hasn't been received after 1 second")
 	}
 
-- 
2.48.1