fix #583 panic on Windows

air-verse · Jun 23, 2024 · 0febf6b · 0febf6b
1 parent 6697b69
commit 0febf6b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 77 deletions.
diff --git a/runner/engine.go b/runner/engine.go
@@ -9,7 +9,6 @@ import (
  "path/filepath"
  "strings"
  "sync"
- "sync/atomic"
  "time"
 
  "github.com/gohugoio/hugo/watcher/filenotify"
@@ -34,7 +33,6 @@ type Engine struct {
 
  mu sync.RWMutex
  watchers uint
- round uint64
  fileChecksums *checksumMap
 
  ll sync.Mutex // lock for logger
@@ -547,7 +545,6 @@ func (e *Engine) runBin() error {
  }
 
  wg.Add(1)
- atomic.AddUint64(&e.round, 1)
  e.withLock(func() {
  close(e.binStopCh)
  e.binStopCh = make(chan bool)

diff --git a/runner/engine_test.go b/runner/engine_test.go
@@ -11,7 +11,6 @@ import (
  "runtime"
  "strings"
  "sync"
- "sync/atomic"
  "syscall"
  "testing"
  "time"
@@ -112,79 +111,6 @@ func TestRegexes(t *testing.T) {
  }
 }
 
-func TestRerun(t *testing.T) {
- tmpDir := initWithQuickExitGoCode(t)
- // change dir to tmpDir
- chdir(t, tmpDir)
- engine, err := NewEngine("", true)
- engine.config.Build.ExcludeUnchanged = true
- engine.config.Build.Rerun = true
- engine.config.Build.RerunDelay = 100
- if err != nil {
- t.Fatalf("Should not be fail: %s.", err)
- }
- go func() {
- engine.Run()
- t.Logf("engine run")
- }()
-
- time.Sleep(time.Second * 1)
-
- // stop engine
- engine.Stop()
- time.Sleep(time.Second * 1)
- t.Logf("engine stopped")
-
- if atomic.LoadUint64(&engine.round) <= 1 {
- t.Fatalf("The engine did't rerun")
- }
-}
-
-func TestRerunWhenFileChanged(t *testing.T) {
- tmpDir := initWithQuickExitGoCode(t)
- // change dir to tmpDir
- chdir(t, tmpDir)
- engine, err := NewEngine("", true)
- engine.config.Build.ExcludeUnchanged = true
- engine.config.Build.Rerun = true
- engine.config.Build.RerunDelay = 100
- if err != nil {
- t.Fatalf("Should not be fail: %s.", err)
- }
- go func() {
- engine.Run()
- t.Logf("engine run")
- }()
- time.Sleep(time.Second * 1)
-
- roundBeforeChange := atomic.LoadUint64(&engine.round)
-
- t.Logf("start change main.go")
- // change file of main.go
- // just append a new empty line to main.go
- time.Sleep(time.Second * 2)
- file, err := os.OpenFile("main.go", os.O_APPEND|os.O_WRONLY, 0o644)
- if err != nil {
- t.Fatalf("Should not be fail: %s.", err)
- }
- defer file.Close()
- _, err = file.WriteString("\n")
- if err != nil {
- t.Fatalf("Should not be fail: %s.", err)
- }
-
- time.Sleep(time.Second * 1)
- // stop engine
- engine.Stop()
- time.Sleep(time.Second * 1)
- t.Logf("engine stopped")
-
- roundAfterChange := atomic.LoadUint64(&engine.round)
- if roundBeforeChange+1 >= roundAfterChange {
- t.Fatalf("The engine didn't rerun")
- }
-}
-
 func TestRunCommand(t *testing.T) {
  // generate a random port
  port, f := GetPort()