From 43a20b9c0e27277ebbc2f89c2132d93d12f1ed45 Mon Sep 17 00:00:00 2001
From: Dan Brakeley <dan@brakeley.net>
Date: Fri, 7 Aug 2020 22:49:59 -0400
Subject: [PATCH] get mage tests to pass on windows

---
 mage/main_test.go | 27 +++++++++++++++++++++------
 mage/template.go  |  1 -
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/mage/main_test.go b/mage/main_test.go
index 9fd5dbb4..a63f661d 100644
--- a/mage/main_test.go
+++ b/mage/main_test.go
@@ -191,7 +191,10 @@ func TestListMagefilesMain(t *testing.T) {
 	if err != nil {
 		t.Errorf("error from magefile list: %v: %s", err, buf)
 	}
-	expected := []string{"testdata/mixed_main_files/mage_helpers.go", "testdata/mixed_main_files/magefile.go"}
+	expected := []string{
+		filepath.FromSlash("testdata/mixed_main_files/mage_helpers.go"),
+		filepath.FromSlash("testdata/mixed_main_files/magefile.go"),
+	}
 	if !reflect.DeepEqual(files, expected) {
 		t.Fatalf("expected %q but got %q", expected, files)
 	}
@@ -211,9 +214,9 @@ func TestListMagefilesIgnoresGOOS(t *testing.T) {
 	}
 	var expected []string
 	if runtime.GOOS == "windows" {
-		expected = []string{"testdata/goos_magefiles/magefile_windows.go"}
+		expected = []string{filepath.FromSlash("testdata/goos_magefiles/magefile_windows.go")}
 	} else {
-		expected = []string{"testdata/goos_magefiles/magefile_nonwindows.go"}
+		expected = []string{filepath.FromSlash("testdata/goos_magefiles/magefile_nonwindows.go")}
 	}
 	if !reflect.DeepEqual(files, expected) {
 		t.Fatalf("expected %q but got %q", expected, files)
@@ -235,9 +238,9 @@ func TestListMagefilesIgnoresRespectsGOOSArg(t *testing.T) {
 	}
 	var expected []string
 	if goos == "windows" {
-		expected = []string{"testdata/goos_magefiles/magefile_windows.go"}
+		expected = []string{filepath.FromSlash("testdata/goos_magefiles/magefile_windows.go")}
 	} else {
-		expected = []string{"testdata/goos_magefiles/magefile_nonwindows.go"}
+		expected = []string{filepath.FromSlash("testdata/goos_magefiles/magefile_nonwindows.go")}
 	}
 	if !reflect.DeepEqual(files, expected) {
 		t.Fatalf("expected %q but got %q", expected, files)
@@ -307,7 +310,10 @@ func TestListMagefilesLib(t *testing.T) {
 	if err != nil {
 		t.Errorf("error from magefile list: %v: %s", err, buf)
 	}
-	expected := []string{"testdata/mixed_lib_files/mage_helpers.go", "testdata/mixed_lib_files/magefile.go"}
+	expected := []string{
+		filepath.FromSlash("testdata/mixed_lib_files/mage_helpers.go"),
+		filepath.FromSlash("testdata/mixed_lib_files/magefile.go"),
+	}
 	if !reflect.DeepEqual(files, expected) {
 		t.Fatalf("expected %q but got %q", expected, files)
 	}
@@ -1078,6 +1084,9 @@ func TestCompiledFlags(t *testing.T) {
 		t.Fatal(err)
 	}
 	name := filepath.Join(compileDir, "mage_out")
+	if runtime.GOOS == "windows" {
+		name += ".exe"
+	}
 	// The CompileOut directory is relative to the
 	// invocation directory, so chop off the invocation dir.
 	outName := "./" + name[len(dir)-1:]
@@ -1162,6 +1171,9 @@ func TestCompiledEnvironmentVars(t *testing.T) {
 		t.Fatal(err)
 	}
 	name := filepath.Join(compileDir, "mage_out")
+	if runtime.GOOS == "windows" {
+		name += ".exe"
+	}
 	// The CompileOut directory is relative to the
 	// invocation directory, so chop off the invocation dir.
 	outName := "./" + name[len(dir)-1:]
@@ -1251,6 +1263,9 @@ func TestCompiledVerboseFlag(t *testing.T) {
 		t.Fatal(err)
 	}
 	filename := filepath.Join(compileDir, "mage_out")
+	if runtime.GOOS == "windows" {
+		filename += ".exe"
+	}
 	// The CompileOut directory is relative to the
 	// invocation directory, so chop off the invocation dir.
 	outName := "./" + filename[len(dir)-1:]
diff --git a/mage/template.go b/mage/template.go
index fbe69719..5d883b1f 100644
--- a/mage/template.go
+++ b/mage/template.go
@@ -92,7 +92,6 @@ Options:
 		fs.Usage()
 		return
 	}
-
 		
 	// color is ANSI color type
 	type color int