Skip to content

Commit a8ee87e

Browse files
authored
*: remove checks for TRAVIS env variable (#3568)
We had a few checks left over for the TRAVIS variable that detected if we were running under the TravisCI build system. This variable hasn't been set since 2020.
1 parent 938cb6e commit a8ee87e

File tree

4 files changed

+1
-29
lines changed

4 files changed

+1
-29
lines changed

_scripts/make.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ This option can only be specified if testset is basic or a single package.`)
130130

131131
func checkCert() bool {
132132
// If we're on OSX make sure the proper CERT env var is set.
133-
if os.Getenv("TRAVIS") == "true" || runtime.GOOS != "darwin" || os.Getenv("CERT") != "" {
133+
if runtime.GOOS != "darwin" || os.Getenv("CERT") != "" {
134134
return true
135135
}
136136

@@ -328,9 +328,6 @@ func testFlags() []string {
328328
}
329329
if NOTimeout {
330330
testFlags = append(testFlags, "-timeout", "0")
331-
} else if os.Getenv("TRAVIS") == "true" {
332-
// Make test timeout shorter than Travis' own timeout so that Go can report which test hangs.
333-
testFlags = append(testFlags, "-timeout", "9m")
334331
}
335332
if len(os.Getenv("TEAMCITY_VERSION")) > 0 {
336333
testFlags = append(testFlags, "-json")
@@ -344,20 +341,6 @@ func testFlags() []string {
344341
func testCmd(cmd *cobra.Command, args []string) {
345342
checkCertCmd(nil, nil)
346343

347-
if os.Getenv("TRAVIS") == "true" && runtime.GOOS == "darwin" {
348-
fmt.Println("Building with native backend")
349-
execute("go", "build", "-tags=macnative", buildFlags(), DelveMainPackagePath)
350-
351-
fmt.Println("\nBuilding without native backend")
352-
execute("go", "build", buildFlags(), DelveMainPackagePath)
353-
354-
fmt.Println("\nTesting")
355-
os.Setenv("PROCTEST", "lldb")
356-
env := []string{}
357-
executeq(env, "sudo", "-E", "go", "test", testFlags(), allPackages())
358-
return
359-
}
360-
361344
if TestSet == "" && TestBackend == "" && TestBuildMode == "" {
362345
if TestRegex != "" {
363346
fmt.Printf("Can not use --test-run without --test-set\n")

cmd/dlv/dlv_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,6 @@ func diffMaybe(t *testing.T, filename string, generated []byte) {
366366
// TestGeneratedDoc tests that the autogenerated documentation has been
367367
// updated.
368368
func TestGeneratedDoc(t *testing.T) {
369-
if strings.ToLower(os.Getenv("TRAVIS")) == "true" && runtime.GOOS == "windows" {
370-
t.Skip("skipping test on Windows in CI")
371-
}
372369
if runtime.GOOS == "windows" && runtime.GOARCH == "arm64" {
373370
//TODO(qmuntal): investigate further when the Windows ARM64 backend is more stable.
374371
t.Skip("skipping test on Windows in CI")

pkg/proc/proc_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,11 +3054,6 @@ func TestIssue877(t *testing.T) {
30543054
if runtime.GOOS != "darwin" && testBackend == "lldb" {
30553055
return
30563056
}
3057-
if os.Getenv("TRAVIS") == "true" && runtime.GOOS == "darwin" {
3058-
// Something changed on Travis side that makes the Go compiler fail if
3059-
// DYLD_LIBRARY_PATH is set.
3060-
t.Skip("broken")
3061-
}
30623057
const envval = "/usr/local/lib"
30633058
t.Setenv("DYLD_LIBRARY_PATH", envval)
30643059
withTestProcess("issue877", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) {

pkg/proc/test/support.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,6 @@ func MustSupportFunctionCalls(t *testing.T, testBackend string) {
307307
t.Skip("this backend does not support function calls")
308308
}
309309

310-
if runtime.GOOS == "darwin" && os.Getenv("TRAVIS") == "true" && runtime.GOARCH == "amd64" {
311-
t.Skip("function call injection tests are failing on macOS on Travis-CI (see #1802)")
312-
}
313310
if runtime.GOARCH == "386" {
314311
t.Skip(fmt.Errorf("%s does not support FunctionCall for now", runtime.GOARCH))
315312
}

0 commit comments

Comments
 (0)