From 7cdc84a15b1f83c6370a79c8e013246a6b495a73 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 14 Dec 2020 21:20:36 -0800 Subject: [PATCH] test: remove bug429 (duplicates runtime.TestSimpleDeadlock) The bug429 tests is an exact duplicate of TestSimpleDeadlock in the runtime package. The runtime package is the right place for this test, and the version in the runtime package will run faster as the build step is combined with other runtime package tests. Change-Id: I6538d24e6df8e8c5e3e399d3ff37d68f3e52be56 Reviewed-on: https://go-review.googlesource.com/c/go/+/278173 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Go Bot Reviewed-by: Than McIntosh Reviewed-by: Cherry Zhang --- test/fixedbugs/bug429.go | 14 -------------- test/fixedbugs/bug429_run.go | 35 ----------------------------------- 2 files changed, 49 deletions(-) delete mode 100644 test/fixedbugs/bug429.go delete mode 100644 test/fixedbugs/bug429_run.go diff --git a/test/fixedbugs/bug429.go b/test/fixedbugs/bug429.go deleted file mode 100644 index 2c31f32da7b..00000000000 --- a/test/fixedbugs/bug429.go +++ /dev/null @@ -1,14 +0,0 @@ -// 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. - -// Should print deadlock message, not hang. -// This test is run by bug429_run.go. - -package main - -func main() { - select {} -} diff --git a/test/fixedbugs/bug429_run.go b/test/fixedbugs/bug429_run.go deleted file mode 100644 index c2bb1b85cbe..00000000000 --- a/test/fixedbugs/bug429_run.go +++ /dev/null @@ -1,35 +0,0 @@ -// run - -// +build !nacl,!js - -// Copyright 2014 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. - -// Run the bug429.go test. - -package main - -import ( - "fmt" - "os" - "os/exec" - "path/filepath" - "strings" -) - -func main() { - cmd := exec.Command("go", "run", filepath.Join("fixedbugs", "bug429.go")) - out, err := cmd.CombinedOutput() - if err == nil { - fmt.Println("expected deadlock") - os.Exit(1) - } - - want := "fatal error: all goroutines are asleep - deadlock!" - got := string(out) - if !strings.Contains(got, want) { - fmt.Printf("got:\n%q\nshould contain:\n%q\n", got, want) - os.Exit(1) - } -}